From 11bbcd4d969e064981a317185e81a654bc65d445 Mon Sep 17 00:00:00 2001
From: John Freeman <john.freeman.opensource@gmail.com>
Date: Tue, 2 Aug 2022 11:43:54 +0100
Subject: [PATCH] Inlined CI shell scripts

To make them easier to extract into a shared workflow.
---
 .github/scripts/build.sh           | 12 ------------
 .github/scripts/deploy-site.sh     | 21 ---------------------
 .github/scripts/deploy.sh          | 12 ------------
 .github/workflows/maven-build.yml  | 18 ++++++++++++++++--
 .github/workflows/maven-deploy.yml |  9 ++++++++-
 .github/workflows/release.yml      | 25 ++++++++++++++++++++++++-
 6 files changed, 48 insertions(+), 49 deletions(-)
 delete mode 100755 .github/scripts/build.sh
 delete mode 100755 .github/scripts/deploy-site.sh
 delete mode 100755 .github/scripts/deploy.sh

diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh
deleted file mode 100755
index fa760a05..00000000
--- a/.github/scripts/build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-
-curl --silent 'https://get.sdkman.io' | bash
-echo sdkman_auto_answer=true > ~/.sdkman/etc/config
-source ~/.sdkman/bin/sdkman-init.sh
-sdk install maven "$MAVEN_VERSION"
-
-export M2_HOME="$HOME/.sdkman/candidates/maven/$MAVEN_VERSION"
-
-"$M2_HOME/bin/mvn" install --batch-mode --show-version -Dinvoker.streamLogs=true
diff --git a/.github/scripts/deploy-site.sh b/.github/scripts/deploy-site.sh
deleted file mode 100755
index f1257c33..00000000
--- a/.github/scripts/deploy-site.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -e
-
-./mvnw site \
-    -DskipTests \
-    -Dinvoker.skip=true \
-    --batch-mode \
-    --show-version
-
-./mvnw site:stage \
-    -DskipTests \
-    -Dinvoker.skip=true \
-    --batch-mode
-
-./mvnw scm-publish:publish-scm \
-    --settings .github/maven/settings.xml \
-    -P gh-pages \
-    -DskipTests \
-    -Dinvoker.skip=true \
-    --batch-mode
diff --git a/.github/scripts/deploy.sh b/.github/scripts/deploy.sh
deleted file mode 100755
index 3b844ba9..00000000
--- a/.github/scripts/deploy.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-set +x
-
-./mvnw deploy \
-    --settings .github/maven/settings.xml \
-    -P publish-artifacts,sign-artifacts,ossrh-deploy \
-    -DskipTests \
-    -Dinvoker.skip=true \
-    --batch-mode \
-    --show-version
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 714f3887..c0518aa6 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -31,10 +31,24 @@ jobs:
         uses: gantsign/maven-periodic-cache-action@v1
         with:
           additional-path: '!~/.m2/repository/com/github/gantsign/maven'
-      - name: Build with Maven
-        run: .github/scripts/build.sh
+      - name: Install Maven ${{ matrix.maven-version }}
+        shell: bash
+        run: |
+          set -e
+          curl --silent 'https://get.sdkman.io' | bash
+          echo sdkman_auto_answer=true > ~/.sdkman/etc/config
+          source ~/.sdkman/bin/sdkman-init.sh
+          sdk install maven "$MAVEN_VERSION"
+          echo "M2_HOME=$HOME/.sdkman/candidates/maven/$MAVEN_VERSION" >> $GITHUB_ENV
         env:
           MAVEN_VERSION: ${{ matrix.maven-version }}
+      - name: Build with Maven
+        run: |
+          "$M2_HOME/bin/mvn" install \
+              --batch-mode \
+              --show-version \
+              -Dinvoker.streamLogs=true
+        env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Code coverage report
         if: matrix.maven-version == '3.6.1'
diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
index f75623a0..01b42333 100644
--- a/.github/workflows/maven-deploy.yml
+++ b/.github/workflows/maven-deploy.yml
@@ -28,7 +28,14 @@ jobs:
           key-suffix: '-deploy'
           additional-path: '!~/.m2/repository/com/github/gantsign/maven'
       - name: Deploy with Maven
-        run: .github/scripts/deploy.sh
+        run: |
+          ./mvnw deploy \
+              --settings .github/maven/settings.xml \
+              -P publish-artifacts,sign-artifacts,ossrh-deploy \
+              -DskipTests \
+              -Dinvoker.skip=true \
+              --batch-mode \
+              --show-version
         env:
           OSSRH_USER: ${{ secrets.OSSRH_USER }}
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1a995b12..0bfeec95 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -43,7 +43,30 @@ jobs:
         run: >-
           git config --global user.name 'John Freeman' &&
           git config --global user.email '17984707+freemanjp@users.noreply.github.com'
+      - name: Build Maven site
+        run: |
+          ./mvnw site \
+              -DskipTests \
+              -Dinvoker.skip=true \
+              --batch-mode \
+              --show-version
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Stage Maven site
+        run: |
+          ./mvnw site:stage \
+              -DskipTests \
+              -Dinvoker.skip=true \
+              --batch-mode
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Deploy Maven site
-        run: .github/scripts/deploy-site.sh
+        run: |
+          ./mvnw scm-publish:publish-scm \
+              --settings .github/maven/settings.xml \
+              -P gh-pages \
+              -DskipTests \
+              -Dinvoker.skip=true \
+              --batch-mode
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}