Create separate workflow for PRs

hinerm · hinerm · commit bca359d4d14c · 2021-06-22T13:55:36.000-05:00
diff --git a/github-action-build.sh b/github-action-build.sh
@@ -75,30 +75,20 @@ EOL
 	# Determine whether deploying will be possible.
 	deployOK=
 	ciURL=$(mvn -q -Denforcer.skip=true -Dexec.executable=echo -Dexec.args='${project.ciManagement.url}' --non-recursive validate exec:exec 2>&1)
+
 	if [ $? -ne 0 ]; then
 		echo "No deploy -- could not extract ciManagement URL"
 		echo "Output of failed attempt follows:"
 		echo "$ciURL"
 	else
-		ciRepo=${ciURL##*/}
-		ciPrefix=${ciURL%/*}
-		ciOrg=${ciPrefix##*/}
-		git config --get remote.origin.url
-		curl -o pull-request.txt https://api.github.com/repos/$ciOrg/$ciRepo/pulls >/dev/null 2>&1 # Check for pull requests
-		curl -o secure-env.txt https://api.github.com/orgs/$ciOrg/$ciRepo/secrets >/dev/null 2>&1 # Check for secure env var
-		if ! grep -q "documentation_url" secure-env.txt; then
+		if [ ! $GPG_KEY_NAME ] || [ ! $GPG_PASSPHRASE ] || [ ! $MAVEN_PASS ] || [ ! $OSSRH_PASS ]; then
 			echo "No deploy -- secure environment variables not available"
-		elif grep -q "url" pull-request.txt; then
+		elif [ $FROM_PR ]; then
 			echo "No deploy -- pull request detected"
-		elif [ ${repo_fork} != "$ciOrg/$ciRepo" ]; then
-			echo "No deploy -- repository fork: ${repo_fork} != $ciOrg/$ciRepo"
 		else
 			echo "All checks passed for artifact deployment"
 			deployOK=1
 		fi
-		# Delete created txt file
-		rm pull-request.txt
-		rm secure-env.txt
 	fi
 
 	# Install GPG on OSX/macOS
diff --git a/github-actionify.sh b/github-actionify.sh
@@ -16,6 +16,7 @@ dir="$(dirname "$0")"
 gitactionDir=.github
 gitactionConfigRoot=/workflows/.gitaction.yml
 gitactionConfig=$gitactionDir$gitactionConfigRoot
+gitactionPRConfig=$gitactionDir/workflows/.gitaction-pr.yml
 gitactionBuildScript=$gitactionDir/build.sh
 gitactionSettingsFile=$gitactionDir/settings.xml
 gitactionNotifyScript=$gitactionDir/notify.sh
@@ -116,19 +117,55 @@ process() {
 
 	test -e "$gitactionDir" -a ! -d "$gitactionDir" && die "$gitactionDir is not a directory"
 	test -e "$gitactionConfig" -a ! -f "$gitactionConfig" && die "$gitactionConfig is not a regular file"
+	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"
 
 	# -- Do things --
 
-	# Add/update the GitHun Actions configuration file.
+	# Add/update the main GitHun Actions configuration file.
 	cat >"$tmpFile" <<EOL
 name: SciJava CI
 
 on:
   push:
     branches:
       - $defaultBranch
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Cache m2 modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ~/.m2
+          key: \${{ runner.os }}-build-\${{ env.cache-name }}
+          restore-keys: |
+            \${{ runner.os }}-build-\${{ env.cache-name }}-
+            \${{ runner.os }}-build-
+            \${{ runner.os }}-
+            
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'zulu'
+      - name: Build with Maven
+        run: ./$gitactionBuildScript
+EOL
+	update "$gitactionConfig"
+
+	# Add/update the GitHun Actions PR configuration file.
+	cat >"$tmpFile" <<EOL
+name: SciJava PR CI
+
+on:
   pull_request:
     branches:
       - $defaultBranch
@@ -159,8 +196,10 @@ jobs:
           distribution: 'zulu'
       - name: Build with Maven
         run: ./$gitactionBuildScript
+        env:
+          FROM_PR: true
 EOL
-	update "$gitactionConfig"
+	update "$gitactionPRConfig"
 
 	# Add/update the GitHub Action build script.
 	cat >"$tmpFile" <<EOL
