Install JReleaser into scripts directory; use a predefined GPG homedir

Signed-off-by: marko-bekhta <[email protected]>

Author: marko-bekhta

deploy.sh

@@ -51,7 +51,7 @@ if [ -f "./jreleaser.yml" ]; then
 	# JReleaser-based build
 	source "$SCRIPTS_DIR/jreleaser-setup.sh"
 	# Execute a JReleaser command such as 'full-release'
-	./jreleaser/bin/jreleaser full-release -Djreleaser.project.version="$RELEASE_VERSION"
+	$SCRIPTS_DIR/jreleaser/bin/jreleaser full-release -Djreleaser.project.version="$RELEASE_VERSION"
 fi
 
 popd

jreleaser-setup.sh

@@ -4,16 +4,18 @@
 #     SCRIPTS_DIR="$(readlink -f ${BASH_SOURCE[0]} | xargs dirname)"
 #     source "$SCRIPTS_DIR/jreleaser-setup.sh"
 
-if [ -d "jreleaser" ]; then
+SCRIPTS_DIR="$(readlink -f ${BASH_SOURCE[0]} | xargs dirname)"
+
+if [ -d "${SCRIPTS_DIR}/jreleaser/bin/jreleaser" ]; then
   echo "JReleaser was already set up. Skipping installation"
-  ./jreleaser/bin/jreleaser --version
+  $SCRIPTS_DIR/jreleaser/bin/jreleaser --version
   return
 fi
 
 echo "About to install JReleaser."
 wget https://github.com/jreleaser/jreleaser/releases/download/v1.17.0/jreleaser-1.17.0.zip -qO jreleaser.zip
 unzip -qq jreleaser.zip
-mv jreleaser-1.17.0 jreleaser
+mv jreleaser-1.17.0/* $SCRIPTS_DIR/jreleaser
 rm jreleaser.zip
 
-./jreleaser/bin/jreleaser --version
+$SCRIPTS_DIR/jreleaser/bin/jreleaser --version

jreleaser/.gitignore

@@ -0,0 +1,3 @@
+# The folder into which we install jreleaser into
+*
+!.gitignore

publish.sh

@@ -77,10 +77,6 @@ fi
 #--------------------------------------------
 # Environment variables
 
-if [ -z "$RELEASE_GPG_HOMEDIR" ]; then
-  echo "ERROR: environment variable RELEASE_GPG_HOMEDIR is not set"
-  exit 1
-fi
 if [ -z "$RELEASE_GPG_PRIVATE_KEY_PATH" ]; then
   echo "ERROR: environment variable RELEASE_GPG_PRIVATE_KEY_PATH is not set"
   exit 1
@@ -125,16 +121,21 @@ trap "cleanup" EXIT
 #--------------------------------------------
 # Actual script
 
-mkdir -p -m 700 "$RELEASE_GPG_HOMEDIR"
+# keep the RELEASE_GPG_HOMEDIR just for the sake of the old release jobs,
+# if those relied on this env variable:
+export RELEASE_GPG_HOMEDIR="$SCRIPTS_DIR/.gpg"
+#we probably can remove the following env variable once all releases are using JReleaser:
 export GNUPGHOME="$RELEASE_GPG_HOMEDIR"
+# this env variable is used by JReleaser to find the keys to sing things:
 export JRELEASER_GPG_HOMEDIR="$RELEASE_GPG_HOMEDIR"
+
+mkdir -p -m 700 "$RELEASE_GPG_HOMEDIR"
 IMPORTED_KEY="$(gpg_import "$RELEASE_GPG_PRIVATE_KEY_PATH")"
 if [ -z "$IMPORTED_KEY" ]; then
   echo "Failed to import GPG key"
   exit 1
 fi
 
-
 RELEASE_VERSION_FAMILY=$(echo "$RELEASE_VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
 
 if [ "$PROJECT" == "orm" ] || [ "$PROJECT" == "reactive" ] || [ "$PROJECT" == "models" ]; then
@@ -150,7 +151,7 @@ if [ "$PROJECT" == "orm" ] || [ "$PROJECT" == "reactive" ] || [ "$PROJECT" == "m
 		# JReleaser-based build
 		source "$SCRIPTS_DIR/jreleaser-setup.sh"
 		# Execute a JReleaser command such as 'full-release'
-		./jreleaser/bin/jreleaser full-release -Djreleaser.project.version="$RELEASE_VERSION"
+		$SCRIPTS_DIR/jreleaser/bin/jreleaser full-release -Djreleaser.project.version="$RELEASE_VERSION"
 	else
 	 EXTRA_ARGS+=" closeAndReleaseSonatypeStagingRepository"
 	fi

snapshot-deploy.sh

@@ -34,4 +34,4 @@ else
 fi
 
 # Execute a JReleaser command such as 'full-release'
-./jreleaser/bin/jreleaser full-release -Djreleaser.project.version="$VERSION"
+$SCRIPTS_DIR/jreleaser/bin/jreleaser full-release -Djreleaser.project.version="$VERSION"