From 4fd7c2abc73fc4c04bb4260a2b9c9653d20b81a3 Mon Sep 17 00:00:00 2001
From: Ashley Scopes <73482956+ascopes@users.noreply.github.com>
Date: Sat, 18 Jun 2022 16:46:33 +0100
Subject: [PATCH 1/2] Update CI build order

Update versions, etc
---
 .github/workflows/build.yml | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 77b2a36bf..6f4f8b1c0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,7 +41,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, ubuntu-latest]
+        os: [windows-latest, macos-latest, ubuntu-latest]
         java-version: [ 11, 12, 13, 14, 15, 16, 17, 18 ]
         include:
           - os: windows-latest
@@ -52,6 +52,9 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+        with:
+          # Needed to keep actions working correctly.
+          fetch-depth: 2
 
       - name: Initialize JDK
         uses: actions/setup-java@v3
@@ -68,32 +71,25 @@ jobs:
           --no-transfer-progress
           '-Dcheckstyle.skip=true'
           '-Dstyle.color=always'
-          '-Dmaven.artifact.threads=100'
+          '-Dmaven.artifact.threads=50'
           clean package
 
-      - name: Annotate test reports
+      - name: Annotate test reports with build environment info
         if: always()
         run: >-
           scripts/prepare-test-outputs-for-merge.sh 
           ${{ matrix.java-version }} 
           ${{ matrix.os }}
 
-      - name: Archive Surefire reports
-        uses: actions/upload-artifact@v2
+      - name: Archive Surefire and Jacoco reports
+        uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: tests-java-${{ matrix.java-version }}-${{ matrix.os }}
+          name: reports-java-${{ matrix.java-version }}-${{ matrix.os }}
           path: |
             **/target/surefire-reports/*.xml
             **/target/surefire-reports/*.txt
-          retention-days: 5
-
-      - name: Archive Jacoco reports
-        uses: actions/upload-artifact@v2
-        if: always()
-        with:
-          name: coverage-java-${{ matrix.java-version }}-${{ matrix.os }}
-          path: "**/target/site/jacoco/jacoco*.xml"
+            **/target/site/jacoco/jacoco*.xml
           retention-days: 5
 
   report-test-results:
@@ -105,13 +101,18 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
-          # Seems we need this set to 2 for codecov to work correctly.
+          # Needed to keep actions working correctly.
           fetch-depth: 2
 
       - name: Download artifacts
         uses: actions/download-artifact@v3
         with:
           path: 'artifacts/'
+          
+      - name: Publish to codecov
+        continue-on-error: true
+        if: always()
+        run: bash <(curl -s https://codecov.io/bash)
 
       - name: Publish unit test results
         uses: EnricoMi/publish-unit-test-result-action@v1
@@ -120,11 +121,6 @@ jobs:
         with:
           files: "artifacts/**/TEST-*.xml"
 
-      - name: Publish code coverage
-        continue-on-error: true
-        if: always()
-        run: bash <(curl -s https://codecov.io/bash)
-
   checkstyle:
     name: Run Checkstyle
     runs-on: ubuntu-latest

From fbf5c49f0f2e22025a873e6468534c9666565784 Mon Sep 17 00:00:00 2001
From: Ashley Scopes <73482956+ascopes@users.noreply.github.com>
Date: Sat, 18 Jun 2022 16:48:29 +0100
Subject: [PATCH 2/2] Disable macos

MacOS doesn't work with the CI currently, so fix it later
---
 .github/workflows/build.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6f4f8b1c0..77d0b78b2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,7 +41,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-latest, ubuntu-latest]
+        os: 
+          - windows-latest
+          - ubuntu-latest
+          # TODO: get working on MacOS
+          #- macos-latest
         java-version: [ 11, 12, 13, 14, 15, 16, 17, 18 ]
         include:
           - os: windows-latest