Split out CI-dependent build code

Author: hinerm

github-action-build.sh renamed to ci-build.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
 
 #
-# github-action-build.sh - A script to build and/or release SciJava-based projects
-#                          automatically using GitHub Actions.
+# ci-build.sh - A script to build and/or release SciJava-based projects
+#                          automatically using a continuous integration
+#                          service.
 #
+# Required environment variables:
+#   BUILD_OS             - the operating system running the current build (e.g. macOS)
+#   BUILD_REPOSITORY     - the repository slug (org/repo) running the current build
 
 dir="$(dirname "$0")"
 
@@ -29,7 +33,7 @@ if [ -f pom.xml ]; then
 	# Populate the settings.xml configuration.
 	mkdir -p "$HOME/.m2"
 	settingsFile="$HOME/.m2/settings.xml"
-	customSettings=.github/settings.xml
+	customSettings=.ci/settings.xml
 	if [ -f "$customSettings" ]; then
 		cp "$customSettings" "$settingsFile"
 	else
@@ -86,23 +90,24 @@ EOL
 		ciOrg=${ciPrefix##*/}
 		if [ ! "$SIGNING_ASC" ] || [ ! "$GPG_KEY_NAME" ] || [ ! "$GPG_PASSPHRASE" ] || [ ! "$MAVEN_PASS" ] || [ ! "$OSSRH_PASS" ]; then
 			echo "No deploy -- secure environment variables not available"
-		elif [ "${GITHUB_REPOSITORY}" != "$ciOrg/$ciRepo" ]; then
-			echo "No deploy -- repository fork: ${GITHUB_REPOSITORY} != $ciOrg/$ciRepo"
+		elif [ "$BUILD_REPOSITORY" != "$ciOrg/$ciRepo" ]; then
+			echo "No deploy -- repository fork: $BUILD_REPOSITORY != $ciOrg/$ciRepo"
 		else
 			echo "All checks passed for artifact deployment"
 			deployOK=1
 		fi
 	fi
 
 	# Install GPG on OSX/macOS
-	if [ ${RUNNER_OS} = 'macOS' ]; then
+	if [ $BUILD_OS = 'macOS' ]; then
 		HOMEBREW_NO_AUTO_UPDATE=1 brew install gnupg2
 	fi
 
 	# Import the GPG signing key.
-	keyFile=.github/signingkey.asc
+	keyFile=.ci/signingkey.asc
 	if [ "$deployOK" ]; then
 		echo "== Importing GPG keypair =="
+		mkdir -p .ci
 		echo "$SIGNING_ASC" > "$keyFile"
 		ls -la "$keyFile"
 		gpg --batch --fast-import "$keyFile"
@@ -171,7 +176,7 @@ if [ -f environment.yml ]; then
 
 	echo
 	echo "== Configuring environment =="
-	condaEnv=github-scijava
+	condaEnv=ci-scijava
 	test -d "$condaDir/envs/$condaEnv" && condaAction=update || condaAction=create
 	conda env "$condaAction" -n "$condaEnv" -f environment.yml &&
 		conda activate "$condaEnv"

github-action-ci.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+#
+# github-action-ci.sh - A script to set up ci-related environment variables from GitHub Actions
+#
+
+echo "BUILD_REPOSITORY=${GITHUB_REPOSITORY}"
+echo "BUILD_OS=${RUNNER_OS}" 
+
+echo "BUILD_REPOSITORY=${GITHUB_REPOSITORY}" >> $GITHUB_ENV
+echo "BUILD_OS=${RUNNER_OS}" >> $GITHUB_ENV

github-actionify.sh

@@ -17,6 +17,7 @@ gitactionDir=.github
 gitactionConfigRoot=/workflows/.gitaction.yml
 gitactionConfig=$gitactionDir$gitactionConfigRoot
 gitactionPRConfig=$gitactionDir/workflows/.gitaction-pr.yml
+gitactionSetupScript=$gitactionDir/setup.sh
 gitactionBuildScript=$gitactionDir/build.sh
 gitactionSettingsFile=$gitactionDir/settings.xml
 gitactionNotifyScript=$gitactionDir/notify.sh
@@ -118,6 +119,7 @@ process() {
 	test -e "$gitactionPRConfig" -a ! -f "$gitactionPRConfig" && die "$gitactionPRConfig is not a regular file"
 	test -e "$gitactionConfig" && warn "$gitactionConfig already exists"
 	test -e "$gitactionBuildScript" && warn "$gitactionBuildScript already exists"
+	test -e "$gitactionSetupScript" && warn "$gitactionSetupScript already exists"
 
 	# -- Do things --
 
@@ -154,6 +156,8 @@ jobs:
         with:
           java-version: '8'
           distribution: 'zulu'
+      - name: Set up CI environment
+        run: ./$gitactionSetupScript
       - name: Build with Maven
         run: ./$gitactionBuildScript
         env:
@@ -199,16 +203,27 @@ jobs:
         with:
           java-version: '8'
           distribution: 'zulu'
+      - name: Set up CI environment
+        run: ./$gitactionSetupScript
       - name: Build with Maven
         run: ./$gitactionBuildScript
 EOL
 	update "$gitactionPRConfig"
 
+	# Add/update the GitHub Action setup script.
+	cat >"$tmpFile" <<EOL
+#!/bin/sh
+curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/github-action-ci.sh
+sh github-action-ci.sh
+EOL
+	chmod +x "$tmpFile"
+	update "$gitactionSetupScript" "GitHub Action: add executable script $gitactionSetupScript" "true"
+
 	# Add/update the GitHub Action build script.
 	cat >"$tmpFile" <<EOL
 #!/bin/sh
-curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/github-action-build.sh
-sh github-action-build.sh
+curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh
+sh ci-build.sh
 EOL
 	chmod +x "$tmpFile"
 	update "$gitactionBuildScript" "GitHub Action: add executable script $gitactionBuildScript" "true"