From 4c609e81e96c9d15d28202a783da05b3b437d653 Mon Sep 17 00:00:00 2001 From: Matthew Scroggs Date: Mon, 13 Nov 2023 10:01:03 +0000 Subject: [PATCH] remove FEniCSx specifics from CI workflows --- .github/workflows/fenicsx-tests.yml | 97 ----------------------------- .github/workflows/pythonapp.yml | 53 +--------------- 2 files changed, 2 insertions(+), 148 deletions(-) delete mode 100644 .github/workflows/fenicsx-tests.yml diff --git a/.github/workflows/fenicsx-tests.yml b/.github/workflows/fenicsx-tests.yml deleted file mode 100644 index 103a2b31..00000000 --- a/.github/workflows/fenicsx-tests.yml +++ /dev/null @@ -1,97 +0,0 @@ -# This workflow will install Basix, FFCx, DOLFINx and run the DOLFINx and FFCx unit tests. - -name: FEniCSx integration - -on: - pull_request: - branches: - - main - -jobs: - ffcx-tests: - name: Run FFCx tests - runs-on: ubuntu-latest - - env: - CC: gcc-10 - CXX: g++-10 - - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: 3.9 - - - name: Install test dependencies - run: | - sudo apt-get install -y graphviz libgraphviz-dev ninja-build pkg-config - - - name: Install UFL - run: | - pip3 install . - - - name: Install Basix - run: | - python3 -m pip install git+https://github.com/FEniCS/basix.git - - - name: Clone FFCx - uses: actions/checkout@v2 - with: - path: ./ffcx - repository: FEniCS/ffcx - ref: main - - name: Install FFCx - run: | - cd ffcx - pip install .[ci] - - name: Run FFCx unit tests - run: python3 -m pytest -n auto ffcx/test - - dolfinx-tests: - name: Run DOLFINx tests - runs-on: ubuntu-latest - container: fenicsproject/test-env:nightly-openmpi - - env: - CC: clang - CXX: clang++ - - PETSC_ARCH: linux-gnu-complex-32 - OMPI_ALLOW_RUN_AS_ROOT: 1 - OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1 - OMPI_MCA_rmaps_base_oversubscribe: 1 - OMPI_MCA_plm: isolated - OMPI_MCA_btl_vader_single_copy_mechanism: none - OMPI_MCA_mpi_yield_when_idle: 1 - OMPI_MCA_hwloc_base_binding_policy: none - - steps: - - uses: actions/checkout@v2 - - name: Install dependencies (Python) - run: | - python3 -m pip install --upgrade pip - - - name: Install UFL - run: | - pip3 install . - - - name: Install Basix and FFCx - run: | - python3 -m pip install git+https://github.com/FEniCS/basix.git - python3 -m pip install git+https://github.com/FEniCS/ffcx.git - - - name: Clone DOLFINx - uses: actions/checkout@v2 - with: - path: ./dolfinx - repository: FEniCS/dolfinx - ref: main - - name: Install DOLFINx - run: | - cmake -G Ninja -DCMAKE_BUILD_TYPE=Developer -B build -S dolfinx/cpp/ - cmake --build build - cmake --install build - pip3 -v install --global-option build --global-option --debug dolfinx/python/ - - name: Run DOLFINx unit tests - run: python3 -m pytest -n auto dolfinx/python/test/unit diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index a5cf4885..7a26fb12 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -28,62 +28,13 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Lint with flake8 - run: | - python -m pip install flake8 - flake8 --statistics . - - name: Check documentation style - run: | - python -m pip install pydocstyle - python -m pydocstyle . - name: Install UFL run: python -m pip install .[ci] - name: Run unit tests run: | - python -m pytest -n auto --cov=ufl/ --junitxml=junit/test-results-${{ matrix.os }}-${{ matrix.python-version }}.xml test/ - - name: Upload to Coveralls - if: ${{ github.repository == 'FEniCS/ufl' && github.head_ref == '' && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.8' }} - env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - run: coveralls - + python -m pytest -n auto test/ + - name: Build documentation run: | cd doc/sphinx make html - - - name: Upload documentation artifact - uses: actions/upload-artifact@v2 - with: - name: doc-${{ matrix.os }}-${{ matrix.python-version }} - path: doc/sphinx/build/html/ - retention-days: 2 - if-no-files-found: error - - - name: Checkout FEniCS/docs - if: ${{ github.repository == 'FEniCS/ufl' && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') ) && runner.os == 'Linux' && matrix.python-version == 3.8 }} - uses: actions/checkout@v2 - with: - repository: "FEniCS/docs" - path: "docs" - ssh-key: "${{ secrets.SSH_GITHUB_DOCS_PRIVATE_KEY }}" - - name: Set version name - if: ${{ github.repository == 'FEniCS/ufl' && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') ) && runner.os == 'Linux' && matrix.python-version == 3.8 }} - run: | - echo "VERSION_NAME=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - - name: Copy documentation into repository - if: ${{ github.repository == 'FEniCS/ufl' && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') ) && runner.os == 'Linux' && matrix.python-version == 3.8 }} - run: | - cd docs - git rm -r --ignore-unmatch ufl/${{ env.VERSION_NAME }} - mkdir -p ufl/${{ env.VERSION_NAME }} - cp -r ../doc/sphinx/build/html/* ufl/${{ env.VERSION_NAME }} - - name: Commit and push documentation to FEniCS/docs - if: ${{ github.repository == 'FEniCS/ufl' && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') ) && runner.os == 'Linux' && matrix.python-version == 3.8 }} - run: | - cd docs - git config --global user.email "fenics@github.com" - git config --global user.name "FEniCS GitHub Actions" - git add --all - git commit --allow-empty -m "Python FEniCS/ufl@${{ github.sha }}" - git push