Merge branch 'dev' into grails4-merge-conflict

Author: temi

.github/workflows/build.yml

@@ -0,0 +1,68 @@
+name: profile-hub build
+
+on:
+  push:
+    branches:
+      - dev
+      - master
+      - feature/**
+      - hotfix/**
+
+env:
+  TZ: Australia/Canberra
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+
+      - name: Install nodejs
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - run: npm install
+
+      - name: Read the profile-hub version from the gradle.properties file
+        id: read_property
+        uses: christian-draeger/read-properties@1.1.0
+        with:
+          path: './gradle.properties'
+          properties: 'profileHubVersion'
+
+      - name: Get the package id for the version read from the properties file
+        uses: castlabs/get-package-version-id-action@v2.0
+        id: versions
+        with:
+          version:  ${{steps.read_property.outputs.profileHubVersion}}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Delete the github package with the id we just retrieved (all SNAPSHOT versions are considered part of the same package)
+        uses: actions/delete-package-versions@v2
+        if: ${{ steps.versions.outputs.ids != '' }}
+        with:
+          package-version-ids: "${{ steps.versions.outputs.ids }}"
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run javascript unit tests
+        run: node_modules/karma/bin/karma start karma.conf.js --single-run --browsers ChromeHeadless
+
+      - name: Clean to remove clover instrumentation
+        uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
+        with:
+          arguments: clean
+
+      - name: Publish the JAR to the repository
+        uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
+        with:
+          arguments: publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.travis.yml

@@ -1,14 +1,18 @@
 os: linux
-dist: bionic
+dist: focal
 language: groovy
 jdk:
-  - openjdk8
+  - openjdk11
 branches:
   only:
-  - master
-  - dev
-  - grails3
-  - grails4
+    - master
+    - dev
+    - /^feature\/.*$/
+    - /^hotfix\/.*$/
+    - grails4
+
+node_js:
+  - 16
 
 before_install:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -26,16 +30,20 @@ install:
   - true
 
 before_script:
+  - cd $TRAVIS_BUILD_DIR
+  - nvm install 16.15.0
+  - nvm use 16.15.0
+  - node -v
   - npm install
 
 script:
   - node_modules/karma/bin/karma start karma.conf.js --single-run --browsers ChromeHeadless
   - ./gradlew check
 
 after_success:
-  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./gradlew clean && travis_retry travis_wait 20 ./gradlew publish'
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./gradlew clean && travis_wait 20 ./gradlew publish'
 
 env:
   global:
     - secure: HQaT+1B5r/7A15V3QHs5Lw1S8jNWgjgCKa8Fz7aEF4F+FHBiTqqM/fvFWcC+g7KHkLhgTht2efEIp9akBt8sArz1xp/BGhKr4JJRGU2uYJE8NpFb08u1OPAvurWQ72bwihJQBJWI9VXiQGoGQffLQL1yLQmlGMFbU/sOLzUxhGQ=
-    - secure: Dc3FdXwu0j+tKyETSmZmULlEmVpQ7yKk+74zauRfEts0IyH1gUEuFr2ODTNUUFrjNRR/yW2dc0erlCyUc/CAGdALVRFzImz45WUjs0VgBtH2MW6tkgLd4DhDTDUpxOZMKZBEK91UVqK/2C0811c3UbvDBbuGrNacW5PPdzYoS9o=
+    - secure: Dc3FdXwu0j+tKyETSmZmULlEmVpQ7yKk+74zauRfEts0IyH1gUEuFr2ODTNUUFrjNRR/yW2dc0erlCyUc/CAGdALVRFzImz45WUjs0VgBtH2MW6tkgLd4DhDTDUpxOZMKZBEK91UVqK/2C0811c3UbvDBbuGrNacW5PPdzYoS9o=

README.md

@@ -0,0 +1,18 @@
+# Profile Hub
+Master: [![Build Status](https://travis-ci.org/AtlasOfLivingAustralia/profile-hub.svg?branch=master)](https://travis-ci.org/AtlasOfLivingAustralia/profile-hub)
+
+Dev: [![Build Status](https://travis-ci.org/AtlasOfLivingAustralia/profile-hub.svg?branch=dev)](https://travis-ci.org/AtlasOfLivingAustralia/profile-hub)
+
+# Design notes and setup instructions
+
+See the [project wiki](https://github.com/AtlasOfLivingAustralia/profile-hub/wiki/).
+
+# Project set up
+
+See the [project setup page](https://github.com/AtlasOfLivingAustralia/profile-hub/wiki/Project-Setup) on the wiki.
+
+# Name Matching
+
+This content has been moved to the [project wiki](https://github.com/AtlasOfLivingAustralia/profile-hub/wiki/Name-Matching).
+
+