Merge branch 'dev' into feature/issue3169

AtlasOfLivingAustralia · Dec 13, 2024 · a44cbd3 · a44cbd3
2 parents 063a26a + ac6d561
commit a44cbd3
Show file tree

Hide file tree

Showing 82 changed files with 39,421 additions and 17,432 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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/gradle-build-action@v2.4.2