Skip to content

Commit

Permalink
Merge pull request #3391 from AtlasOfLivingAustralia/dev
Browse files Browse the repository at this point in the history
Preparing v4.1
  • Loading branch information
chrisala authored Dec 13, 2024
2 parents dd86fa0 + e6eacbd commit e055287
Show file tree
Hide file tree
Showing 128 changed files with 110,540 additions and 18,802 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ jobs:
- name: Run javascript unit tests
run: node_modules/karma/bin/karma start karma.conf.js --single-run --browsers ChromeHeadless

- name: Run MERIT functional tests
run: ./src/main/scripts/runFunctionalTests.sh
env:
GPR_USER: ${{env.GITHUB_ACTOR}}
GPR_TOKEN: ${{secrets.GITHUB_TOKEN}}
# - name: Run MERIT functional tests
# run: ./src/main/scripts/runFunctionalTests.sh
# env:
# GPR_USER: ${{env.GITHUB_ACTOR}}
# GPR_TOKEN: ${{secrets.GITHUB_TOKEN}}

- name: Clean to remove clover instrumentation
uses: gradle/[email protected]
Expand Down
Loading

0 comments on commit e055287

Please sign in to comment.