diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc7b2f119d6fe948be172fd1ee201ab6a1c79e7e..43b29b1aa12b61d8f663741d85e3c9dd80513c1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,37 +66,6 @@ jobs: with_echo python -m pip install mpi4py test_py_project - firedrake: - name: Pytest Firedrake - runs-on: ubuntu-latest - container: - image: 'firedrakeproject/firedrake' - steps: - - uses: actions/checkout@v1 - - name: "Dependencies" - run: | - . .ci/install-for-firedrake.sh - - name: "Test" - run: | - . /home/firedrake/firedrake/bin/activate - cd test - python -m pytest --tb=native -rxsw test_firedrake_interop.py - - firedrake_examples: - name: Examples Firedrake - runs-on: ubuntu-latest - container: - image: 'firedrakeproject/firedrake' - steps: - - uses: actions/checkout@v1 - - name: "Dependencies" - run: | - . .ci/install-for-firedrake.sh - - name: "Examples" - run: | - . /home/firedrake/firedrake/bin/activate - . ./.ci/run_firedrake_examples.sh - examples3: name: Examples Conda Py3 runs-on: ubuntu-latest @@ -144,7 +113,8 @@ jobs: downstream_tests: strategy: matrix: - downstream_project: [grudge, pytential, mirgecom] + # downstream_project: [meshmode, grudge, pytential, mirgecom] + downstream_project: [] name: Tests for downstream project ${{ matrix.downstream_project }} runs-on: ubuntu-latest steps: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f31b61ca72b55d5459dd38bb1822bb237e616545..632f095d21069c7f592cb98ce17415d74741d3e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,29 +64,6 @@ Python 3 POCL Examples: - LOOPY_BRANCH: main - LOOPY_BRANCH: kernel_callables_v3-edit2 -Python 3 POCL Firedrake: - tags: - - "docker-runner" - image: "firedrakeproject/firedrake" - script: - - . .ci/install-for-firedrake.sh - - cd test - - python -m pytest --tb=native --junitxml=pytest.xml -rxsw test_firedrake_interop.py - artifacts: - reports: - junit: test/pytest.xml - -Python 3 POCL Firedrake Examples: - tags: - - "docker-runner" - image: "firedrakeproject/firedrake" - script: - - . .ci/install-for-firedrake.sh - - . ./.ci/run_firedrake_examples.sh - artifacts: - reports: - junit: test/pytest.xml - Python 3 Conda: script: | sed -i "s/loopy.git/loopy.git@$LOOPY_BRANCH/g" requirements.txt