ci-build: fix project fork detection

ctrueden · ctrueden · commit 84f8b33f82e5 · 2021-07-01T14:51:21.000-05:00
Let's make BUILD_REPOSITORY be the complete SCM URL as specified in
the pom.xml. That way, other ci-setup-&lt;foo&gt; scripts can set the URL
according to their platform as well, and we compare the whole string.
diff --git a/ci-build.sh b/ci-build.sh
@@ -2,11 +2,10 @@
 
 #
 # ci-build.sh - A script to build and/or release SciJava-based projects
-#                          automatically using a continuous integration
-#                          service.
+#               automatically using a continuous integration service.
 #
-# Required environment variables:
-#   BUILD_REPOSITORY     - the repository slug (org/repo) running the current build
+# Optional environment variables:
+#   BUILD_REPOSITORY - the repository URL running the current build
 
 dir="$(dirname "$0")"
 
@@ -77,20 +76,18 @@ 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)
+	scmURL=$(mvn -q -Denforcer.skip=true -Dexec.executable=echo -Dexec.args='${project.scm.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"
+		echo "$scmURL"
 	else
-		ciRepo=${ciURL##*/}
-		ciPrefix=${ciURL%/*}
-		ciOrg=${ciPrefix##*/}
+		scmRepo=${scmURL##*/}
 		if [ ! "$SIGNING_ASC" ] || [ ! "$GPG_KEY_NAME" ] || [ ! "$GPG_PASSPHRASE" ] || [ ! "$MAVEN_PASS" ] || [ ! "$OSSRH_PASS" ]; then
 			echo "No deploy -- secure environment variables not available"
-		elif [ "$BUILD_REPOSITORY" != "$ciOrg/$ciRepo" ]; then
-			echo "No deploy -- repository fork: $BUILD_REPOSITORY != $ciOrg/$ciRepo"
+		elif [ "$BUILD_REPOSITORY" -a "$BUILD_REPOSITORY" != "$scmRepo" ]; then
+			echo "No deploy -- repository fork: $BUILD_REPOSITORY != $scmRepo"
 		else
 			echo "All checks passed for artifact deployment"
 			deployOK=1
diff --git a/ci-setup-github-actions.sh b/ci-setup-github-actions.sh
@@ -4,8 +4,8 @@
 # ci-setup-github-actions.sh - Set CI-related environment variables from GitHub Actions.
 #
 
-echo "BUILD_REPOSITORY=${GITHUB_REPOSITORY}"
+echo "BUILD_REPOSITORY=https://github.com/${GITHUB_REPOSITORY}"
 echo "BUILD_OS=${RUNNER_OS}" 
 
-echo "BUILD_REPOSITORY=${GITHUB_REPOSITORY}" >> $GITHUB_ENV
+echo "BUILD_REPOSITORY=https://github.com/${GITHUB_REPOSITORY}" >> $GITHUB_ENV
 echo "BUILD_OS=${RUNNER_OS}" >> $GITHUB_ENV

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`# ci-setup-github-actions.sh - Set CI-related environment variables from GitHub Actions.`
`5`	`5`	`#`
`6`	`6`
`7`		`-echo "BUILD_REPOSITORY=${GITHUB_REPOSITORY}"`
	`7`	`+echo "BUILD_REPOSITORY=https://github.com/${GITHUB_REPOSITORY}"`
`8`	`8`	`echo "BUILD_OS=${RUNNER_OS}"`
`9`	`9`
`10`		`-echo "BUILD_REPOSITORY=${GITHUB_REPOSITORY}" >> $GITHUB_ENV`
	`10`	`+echo "BUILD_REPOSITORY=https://github.com/${GITHUB_REPOSITORY}" >> $GITHUB_ENV`
`11`	`11`	`echo "BUILD_OS=${RUNNER_OS}" >> $GITHUB_ENV`