Skip to content

Commit 25c3a28

Browse files
authored
Merge branch 'main' into main
2 parents 4febed8 + b8dd73a commit 25c3a28

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

Diff for: .github/workflows/build.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
pull_request:
88
branches:
99
- main
10+
workflow_dispatch:
1011

1112
jobs:
1213
build:
@@ -15,7 +16,7 @@ jobs:
1516
steps:
1617
- run: sudo apt-get install -y ruby-bundler
1718
name: Install prerequisites
18-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
1920
- run: bundle install
2021
name: Install bundle
2122
- run: bundle exec jekyll build

Diff for: .github/workflows/run-tests.yml

+13-2
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ on:
99
- main
1010
schedule:
1111
- cron: "0 7 * * 1"
12+
workflow_dispatch:
1213

1314
jobs:
1415
run-tests:
1516
name: Run tests
1617
runs-on: ubuntu-latest
1718
container: dolfinx/dolfinx:stable
1819
steps:
19-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v4
2021
- run: pip3 install pytest flake8
2122
name: Install pytest and flake8
2223
- run: pip3 install -r _test/requirements.txt
@@ -25,5 +26,15 @@ jobs:
2526
name: Run flake8 on tests
2627
- run: flake8 _tools/
2728
name: Run flake8 on tools
28-
- run: GITHUB_TOKEN=${{ secrets.symfembot_token }} python3 -m pytest _test/ --has-fenicsx 1
29+
- run: |
30+
TOKEN=${{ secrets.symfembot_token }}
31+
if [ -n "${TOKEN}" ]; then
32+
echo "token=${TOKEN}" >> ${GITHUB_OUTPUT}
33+
else
34+
echo "token=${{ github.token }}" >> ${GITHUB_OUTPUT}
35+
fi
36+
shell: bash
37+
name: Determine which token to use when running tests
38+
id: token
39+
- run: GITHUB_TOKEN=${{ steps.token.outputs.token }} python3 -m pytest _test/ --has-fenicsx 1
2940
name: Run tests

0 commit comments

Comments
 (0)