Merge remote-tracking branch 'origin/dev' into feature/issue3356

AtlasOfLivingAustralia · Jan 6, 2025 · 7a5d653 · 7a5d653
2 parents 52bc692 + 5f7c662
commit 7a5d653
Show file tree

Hide file tree

Showing 134 changed files with 116,685 additions and 19,164 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

diff --git a/build.gradle b/build.gradle
@@ -188,7 +188,7 @@ dependencies {
     providedCompile "io.methvin:directory-watcher:0.4.0"
 
     if (!Boolean.valueOf(inplace)) {
-        implementation "org.grails.plugins:ecodata-client-plugin:7.0"
+        implementation "org.grails.plugins:ecodata-client-plugin:7.2-SNAPSHOT"
     }
 }