Skip to content
Snippets Groups Projects
Commit cb54f15d authored by Jakob Fritz's avatar Jakob Fritz
Browse files

Reverted initial changes

so that Github-Actions now should run again
parent 35d87b69
Branches
No related tags found
No related merge requests found
Pipeline #169856 passed
...@@ -3,8 +3,8 @@ name: CI pipeline for pySDC ...@@ -3,8 +3,8 @@ name: CI pipeline for pySDC
on: on:
push: push:
pull_request: pull_request:
# schedule: schedule:
# - cron: '1 5 * * 1' - cron: '1 5 * * 1'
jobs: jobs:
...@@ -54,119 +54,119 @@ jobs: ...@@ -54,119 +54,119 @@ jobs:
GITLAB_PROJECT_ID: "5992" GITLAB_PROJECT_ID: "5992"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# user_cpu_tests_linux: user_cpu_tests_linux:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# strategy: strategy:
# matrix: matrix:
# python: ['3.7', '3.8', '3.9', '3.10'] python: ['3.7', '3.8', '3.9', '3.10']
# env: ['base', 'fenics', 'mpi4py', 'petsc'] env: ['base', 'fenics', 'mpi4py', 'petsc']
# defaults: defaults:
# run: run:
# shell: bash -l {0} shell: bash -l {0}
# steps: steps:
# - name: Checkout - name: Checkout
# uses: actions/checkout@v3 uses: actions/checkout@v3
# - name: Install Conda environment with Micromamba - name: Install Conda environment with Micromamba
# uses: mamba-org/setup-micromamba@v1 uses: mamba-org/setup-micromamba@v1
# with: with:
# environment-file: "etc/environment-${{ matrix.env }}.yml" environment-file: "etc/environment-${{ matrix.env }}.yml"
# create-args: >- create-args: >-
# python=${{ matrix.python }} python=${{ matrix.python }}
# - name: Run pytest for CPU stuff - name: Run pytest for CPU stuff
# run: | run: |
# echo "print('Loading sitecustomize.py...') echo "print('Loading sitecustomize.py...')
# import coverage import coverage
# coverage.process_startup() " > sitecustomize.py coverage.process_startup() " > sitecustomize.py
# coverage run -m pytest --continue-on-collection-errors -v --durations=0 pySDC/tests -m ${{ matrix.env }} coverage run -m pytest --continue-on-collection-errors -v --durations=0 pySDC/tests -m ${{ matrix.env }}
# - name: Make coverage report - name: Make coverage report
# run: | run: |
# mv data data_${{ matrix.python }} mv data data_${{ matrix.python }}
# coverage combine coverage combine
# mv .coverage coverage_${{ matrix.env }}_${{ matrix.python }}.dat mv .coverage coverage_${{ matrix.env }}_${{ matrix.python }}.dat
# - name: Uploading artifacts - name: Uploading artifacts
# uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
# if: matrix.python == '3.10' if: matrix.python == '3.10'
# with: with:
# name: cpu-test-artifacts name: cpu-test-artifacts
# path: | path: |
# data_3.10 data_3.10
# coverage_${{ matrix.env }}_3.10.dat coverage_${{ matrix.env }}_3.10.dat
# user_libpressio_tests: user_libpressio_tests:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# container: container:
# image: brownbaerchen/libpressio:amd64_2 image: brownbaerchen/libpressio:amd64_2
# volumes: volumes:
# - ${{ github.workspace }}:/pySDC - ${{ github.workspace }}:/pySDC
# defaults: defaults:
# run: run:
# shell: bash -l {0} shell: bash -l {0}
# steps: steps:
# - name: Checkout - name: Checkout
# uses: actions/checkout@v3 uses: actions/checkout@v3
# - name: Install pySDC and pytest - name: Install pySDC and pytest
# run: | run: |
# source /pySDC/pySDC/projects/compression/Docker/install_pySDC.sh source /pySDC/pySDC/projects/compression/Docker/install_pySDC.sh
# - name: Run pytest - name: Run pytest
# run: | run: |
# source /opt/spack/share/spack/setup-env.sh source /opt/spack/share/spack/setup-env.sh
# spack load libpressio spack load libpressio
# coverage run -m pytest --continue-on-collection-errors -v --durations=0 pySDC/tests -m libpressio coverage run -m pytest --continue-on-collection-errors -v --durations=0 pySDC/tests -m libpressio
# - name: Make coverage report - name: Make coverage report
# run: | run: |
# source /opt/spack/share/spack/setup-env.sh source /opt/spack/share/spack/setup-env.sh
# spack load libpressio spack load libpressio
# mv data data_libpressio mv data data_libpressio
# coverage combine coverage combine
# mv .coverage coverage_libpressio_3.10.dat mv .coverage coverage_libpressio_3.10.dat
# - name: Upload artifacts - name: Upload artifacts
# uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
# with: with:
# name: cpu-test-artifacts name: cpu-test-artifacts
# path: | path: |
# data_libpressio data_libpressio
# coverage_libpressio_3.10.dat coverage_libpressio_3.10.dat
# user_cpu_tests_macos: user_cpu_tests_macos:
# runs-on: macos-12 runs-on: macos-12
# strategy: strategy:
# matrix: matrix:
# env: ['base', 'fenics', 'mpi4py', 'petsc'] env: ['base', 'fenics', 'mpi4py', 'petsc']
# defaults: defaults:
# run: run:
# shell: bash -l {0} shell: bash -l {0}
# steps: steps:
# - name: Checkout - name: Checkout
# uses: actions/checkout@v3 uses: actions/checkout@v3
# - name: Install Conda environment with Micromamba - name: Install Conda environment with Micromamba
# uses: mamba-org/setup-micromamba@v1 uses: mamba-org/setup-micromamba@v1
# with: with:
# environment-file: "etc/environment-${{ matrix.env }}.yml" environment-file: "etc/environment-${{ matrix.env }}.yml"
# - name: Run pytest for CPU stuff - name: Run pytest for CPU stuff
# run: | run: |
# pytest --continue-on-collection-errors -v --durations=0 pySDC/tests -m ${{ matrix.env }} pytest --continue-on-collection-errors -v --durations=0 pySDC/tests -m ${{ matrix.env }}
wait_for_gitlab: wait_for_gitlab:
...@@ -203,50 +203,50 @@ jobs: ...@@ -203,50 +203,50 @@ jobs:
# ls -ratl # ls -ratl
# post-processing: post-processing:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# if: ${{ github.repository_owner == 'Parallel-in-Time'}} if: ${{ github.repository_owner == 'Parallel-in-Time'}}
# needs: needs:
# - lint - lint
# - user_cpu_tests_linux - user_cpu_tests_linux
# - user_libpressio_tests - user_libpressio_tests
# - wait_for_gitlab # - wait_for_gitlab
# defaults: defaults:
# run: run:
# shell: bash -l {0} shell: bash -l {0}
# steps: steps:
# - name: Checkout - name: Checkout
# uses: actions/checkout@v3 uses: actions/checkout@v3
# - name: Install Conda environment with Micromamba - name: Install Conda environment with Micromamba
# uses: mamba-org/setup-micromamba@v1 uses: mamba-org/setup-micromamba@v1
# with: with:
# environment-file: "etc/environment-base.yml" environment-file: "etc/environment-base.yml"
# - name: Downloading artifacts - name: Downloading artifacts
# uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
# with: with:
# path: . path: .
# - name: Prepare artifacts - name: Prepare artifacts
# run: | run: |
# ls -artl cpu-test-artifacts ls -artl cpu-test-artifacts
# cp cpu-test-artifacts/data_3.10/* data/. cp cpu-test-artifacts/data_3.10/* data/.
# python -m coverage combine cpu-test-artifacts/coverage_*_3.10.dat python -m coverage combine cpu-test-artifacts/coverage_*_3.10.dat
# python -m coverage xml python -m coverage xml
# python -m coverage html python -m coverage html
# - name: Generate Coverage badge - name: Generate Coverage badge
# run: | run: |
# pip install genbadge[all] pip install genbadge[all]
# genbadge coverage -i coverage.xml -o htmlcov/coverage-badge.svg genbadge coverage -i coverage.xml -o htmlcov/coverage-badge.svg
# - name: Upload coverage reports to Codecov - name: Upload coverage reports to Codecov
# uses: codecov/codecov-action@v3 uses: codecov/codecov-action@v3
# - name: Generate benchmark report # - name: Generate benchmark report
# uses: pancetta/github-action-benchmark@v1 # uses: pancetta/github-action-benchmark@v1
...@@ -271,13 +271,13 @@ jobs: ...@@ -271,13 +271,13 @@ jobs:
# user_email: 'sig.pancetta+github@email.com' # user_email: 'sig.pancetta+github@email.com'
# user_name: 'pancetta' # user_name: 'pancetta'
# - name: Build html I - name: Build html I
# run: | run: |
# chmod u+x ./docs/update_apidocs.sh chmod u+x ./docs/update_apidocs.sh
# ./docs/update_apidocs.sh ./docs/update_apidocs.sh
# sphinx-build -b html docs/source docs/build/html sphinx-build -b html docs/source docs/build/html
# mkdir -p docs/build/html/coverage mkdir -p docs/build/html/coverage
# mv htmlcov/* docs/build/html/coverage/. mv htmlcov/* docs/build/html/coverage/.
# - name: Build html II # - name: Build html II
# if: "!contains(github.event.head_commit.message, '[CI-no-benchmarks]')" # if: "!contains(github.event.head_commit.message, '[CI-no-benchmarks]')"
...@@ -285,18 +285,18 @@ jobs: ...@@ -285,18 +285,18 @@ jobs:
# mkdir -p docs/build/html/benchmarks # mkdir -p docs/build/html/benchmarks
# cp -r bench/${{ github.head_ref || github.ref_name }}/* docs/build/html/benchmarks/. # cp -r bench/${{ github.head_ref || github.ref_name }}/* docs/build/html/benchmarks/.
# - name: Store docs - name: Store docs
# uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
# with: with:
# name: docs name: docs
# path: docs/build/html path: docs/build/html
# - name: Deploy 🚀 - name: Deploy 🚀
# uses: JamesIves/github-pages-deploy-action@v4 uses: JamesIves/github-pages-deploy-action@v4
# if: ${{ github.event_name == 'push' && github.repository_owner == 'Parallel-in-Time' && github.ref == 'refs/heads/master' }} if: ${{ github.event_name == 'push' && github.repository_owner == 'Parallel-in-Time' && github.ref == 'refs/heads/master' }}
# with: with:
# branch: gh-pages # The branch the action should deploy to. branch: gh-pages # The branch the action should deploy to.
# folder: docs/build/html # The folder the action should deploy. folder: docs/build/html # The folder the action should deploy.
# spawn_gitlab_and_postprocess: # spawn_gitlab_and_postprocess:
# runs-on: ubuntu-latest # runs-on: ubuntu-latest
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment