Merge branch 'main' into main

FEniCS · Dec 8, 2023 · 25c3a28 · 25c3a28
2 parents 4febed8 + b8dd73a
commit 25c3a28
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   build:
@@ -15,7 +16,7 @@ jobs:
     steps:
       - run: sudo apt-get install -y ruby-bundler
         name: Install prerequisites
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: bundle install
         name: Install bundle
       - run: bundle exec jekyll build

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,14 +9,15 @@ on:
       - main
   schedule:
     - cron: "0 7 * * 1"
+  workflow_dispatch:
 
 jobs:
   run-tests:
     name: Run tests
     runs-on: ubuntu-latest
     container: dolfinx/dolfinx:stable
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: pip3 install pytest flake8
         name: Install pytest and flake8
       - run: pip3 install -r _test/requirements.txt
@@ -25,5 +26,15 @@ jobs:
         name: Run flake8 on tests
       - run: flake8 _tools/
         name: Run flake8 on tools
-      - run: GITHUB_TOKEN=${{ secrets.symfembot_token }} python3 -m pytest _test/ --has-fenicsx 1
+      - run: |
+          TOKEN=${{ secrets.symfembot_token }}
+          if [ -n "${TOKEN}" ]; then
+            echo "token=${TOKEN}" >> ${GITHUB_OUTPUT}
+          else
+            echo "token=${{ github.token }}" >> ${GITHUB_OUTPUT}
+          fi
+        shell: bash
+        name: Determine which token to use when running tests
+        id: token
+      - run: GITHUB_TOKEN=${{ steps.token.outputs.token }} python3 -m pytest _test/ --has-fenicsx 1
         name: Run tests