Add models to the script

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

Author: marko-bekhta

deploy.sh

@@ -1,19 +1,5 @@
 #!/usr/bin/env -S bash -e
 
-while getopts 'd:' opt; do
-  case "$opt" in
-  d)
-    # Dry run
-    echo "DRY RUN: will not push/deploy/publish anything."
-    export JRELEASER_DRY_RUN=true
-    ;;
-  \?)
-    usage
-    exit 1
-    ;;
-  esac
-done
-
 SCRIPTS_DIR="$(readlink -f ${BASH_SOURCE[0]} | xargs dirname)"
 
 PROJECT=$1
@@ -62,17 +48,9 @@ else
 
 	if [ -f "./jreleaser.yml" ]; then
 		# JReleaser-based build
-		export JRELEASER_GPG_HOMEDIR="$RELEASE_GPG_HOMEDIR"
-		# Get the jreleaser downloader
-		curl -sL https://git.io/get-jreleaser > get_jreleaser.java
-		# Download JReleaser with version = <version>
-		# Change <version> to a tagged JReleaser release
-		# or leave it out to pull `latest`.
-		java get_jreleaser.java
-		# Let's check we've got the right version
-		java -jar jreleaser-cli.jar --version
+		source "$SCRIPTS_DIR/jreleaser-setup.sh"
 		# Execute a JReleaser command such as 'full-release'
-		java -jar jreleaser-cli.jar full-release -Djreleaser.project.version="$RELEASE_VERSION"
+		./jreleaser/bin/jreleaser full-release -Djreleaser.project.version="$RELEASE_VERSION"
 	fi
 fi
 

determine-current-version.sh

@@ -15,6 +15,8 @@ if [ "$PROJECT" == "orm" ]; then
 elif [ "$PROJECT" == "reactive" ]; then
 	# For example, if `version.properties` contains `projectVersion=2.4.5-SNAPSHOT`, it returns `2.4.5-SNAPSHOT`
 	grep projectVersion $WORKSPACE/gradle/version.properties|cut -d'=' -f2
+elif [ "$PROJECT" == "models" ]; then
+	cat $WORKSPACE/version.txt
 elif [ -f './gradlew' ]; then
 	# Gradle-based build
 	grep hibernateVersion $WORKSPACE/gradle/version.properties|cut -d'=' -f2

jreleaser-setup.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env -S bash -e
+# To be sourced from other scripts. Tip: use the following lines to source it independently from the PWD,
+# provided your script is in the same directory as this one:
+#     SCRIPTS_DIR="$(readlink -f ${BASH_SOURCE[0]} | xargs dirname)"
+#     source "$SCRIPTS_DIR/jreleaser-setup.sh"
+
+if [ -d "jreleaser" ]; then
+  echo "JReleaser was already set up."
+  ./jreleaser/bin/jreleaser --version
+  return
+fi
+
+wget https://github.com/jreleaser/jreleaser/releases/download/v1.17.0/jreleaser-1.17.0.zip -qO jreleaser.zip
+unzip jreleaser.zip
+mv jreleaser-1.17.0 jreleaser
+rm jreleaser.zip
+
+./jreleaser/bin/jreleaser --version

prepare-release.sh

@@ -40,17 +40,18 @@ pushd $WORKSPACE
 git config --local user.name "Hibernate CI"
 git config --local user.email "[email protected]"
 
-if [ "$PROJECT" == "orm" ] || [ "$PROJECT" == "reactive" ]; then
+if [ "$PROJECT" == "orm" ] || [ "$PROJECT" == "reactive" ] || [ "$PROJECT" == "models" ]; then
 	RELEASE_VERSION_BASIS=$(echo "$RELEASE_VERSION" | sed -E 's/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
 	RELEASE_VERSION_FAMILY=$(echo "$RELEASE_VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
 	"$SCRIPTS_DIR/validate-release.sh" $PROJECT $RELEASE_VERSION
 	# set release version
 	# update changelog from JIRA
 	# tags the version
 	# changes the version to the provided development version
-	./gradlew clean releasePrepare -x test --no-scan --no-daemon --no-build-cache \
+	./gradlew clean releasePrepare pTML -x test --no-scan --no-daemon --no-build-cache \
 		-PreleaseVersion=$RELEASE_VERSION -PdevelopmentVersion=$DEVELOPMENT_VERSION \
-		-PgitRemote=origin -PgitBranch=$BRANCH
+		-PgitRemote=origin -PgitBranch=$BRANCH \
+		-Dmaven.repo.local=$(pwd)/build/staging-deploy/maven
 else
 	if [[ "$PROJECT" != "tools" && "$PROJECT" != "hcann" && ! $PROJECT =~ ^infra-.+ ]]; then
 		# These projects do not have a distribution bundle archive,

publish.sh

@@ -73,13 +73,10 @@ if [ -z "$DEVELOPMENT_VERSION" ]; then
 	echo "ERROR: Development version not supplied"
 	exit 1
 fi
-if [ "$PUSH_CHANGES" != "true" ]; then
-	ADDITIONAL_OPTIONS="-d"
-fi
 
 RELEASE_VERSION_FAMILY=$(echo "$RELEASE_VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
 
-if [ "$PROJECT" == "orm" ] || [ "$PROJECT" == "reactive" ]; then
+if [ "$PROJECT" == "orm" ] || [ "$PROJECT" == "reactive" ] || [ "$PROJECT" == "models" ]; then
 	git config user.email [email protected]
 	git config user.name Hibernate-CI
 
@@ -88,12 +85,21 @@ if [ "$PROJECT" == "orm" ] || [ "$PROJECT" == "reactive" ]; then
 	  EXTRA_ARGS=" --dry-run"
 	fi
 
-  ./gradlew releasePerform closeAndReleaseSonatypeStagingRepository -x test \
-    --no-scan --no-daemon --no-build-cache --stacktrace $EXTRA_ARGS \
-    -PreleaseVersion=$RELEASE_VERSION -PdevelopmentVersion=$DEVELOPMENT_VERSION \
-    -PdocPublishBranch=production -PgitRemote=origin -PgitBranch=$BRANCH
+	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"
+	else
+	 EXTRA_ARGS+=" closeAndReleaseSonatypeStagingRepository"
+	fi
+
+	./gradlew releasePerform -x test \
+  				--no-scan --no-daemon --no-build-cache --stacktrace $EXTRA_ARGS \
+  				-PreleaseVersion=$RELEASE_VERSION -PdevelopmentVersion=$DEVELOPMENT_VERSION \
+  				-PdocPublishBranch=production -PgitRemote=origin -PgitBranch=$BRANCH
 else
-	bash -xe "$SCRIPTS_DIR/deploy.sh" $ADDITIONAL_OPTIONS "$PROJECT"
+	bash -xe "$SCRIPTS_DIR/deploy.sh" "$PROJECT"
 	if [[ "$PROJECT" != "tools" && "$PROJECT" != "hcann" && ! $PROJECT =~ ^infra-.+ ]]; then
 		exec_or_dry_run bash -xe "$SCRIPTS_DIR/upload-distribution.sh" "$PROJECT" "$RELEASE_VERSION"
 		exec_or_dry_run bash -xe "$SCRIPTS_DIR/upload-documentation.sh" "$PROJECT" "$RELEASE_VERSION" "$RELEASE_VERSION_FAMILY"

release.sh

@@ -40,6 +40,7 @@ while getopts 'dhb:' opt; do
     # Dry run
     echo "DRY RUN: will not push/deploy/publish anything."
     PUSH_CHANGES=false
+    export JRELEASER_DRY_RUN=true
     function exec_or_dry_run() {
       echo "DRY RUN; would have executed:" "${@}"
     }
@@ -112,6 +113,8 @@ elif [ "$PROJECT" == "reactive" ]; then
   JIRA_PROJECT="HREACT"
 elif [ "$PROJECT" == "tools" ]; then
   JIRA_PROJECT="HBX"
+elif [ "$PROJECT" == "models" ]; then
+  echo 'No JIRA project available'
 elif [[ $PROJECT =~ ^infra-.+ ]]; then
   echo 'No JIRA project available'
 else
@@ -145,7 +148,6 @@ function gpg_import() {
 	keyId=$(gpg "${@}" --batch --import "$privateKeyPath" 2>&1 | tee >(cat 1>&2) | grep 'key.*: secret key imported' | sed -E 's/.*key ([^:]+):.*/\1/')
 	# output the fingerprint of the imported key
 	gpg "${@}" --list-secret-keys --with-colon "$keyId" | sed -E '2!d;s/.*:([^:]+):$/\1/'
-	export JRELEASER_GPG_KEYNAME=$keyId
 }
 
 function gpg_delete() {
@@ -181,6 +183,7 @@ if [ -e "$RELEASE_GPG_HOMEDIR" ]; then
 fi
 mkdir -p -m 700 "$RELEASE_GPG_HOMEDIR"
 export GNUPGHOME="$RELEASE_GPG_HOMEDIR"
+export JRELEASER_GPG_HOMEDIR="$RELEASE_GPG_HOMEDIR"
 IMPORTED_KEY="$(gpg_import "$RELEASE_GPG_PRIVATE_KEY_PATH")"
 if [ -z "$IMPORTED_KEY" ]; then
   echo "Failed to import GPG key"

validate-release.sh

@@ -33,6 +33,8 @@ elif [ "$PROJECT" == "hcann" ]; then
   STRIPPED_SUFFIX_FOR_TAG=""
 elif [ "$PROJECT" == "tools" ]; then
   STRIPPED_SUFFIX_FOR_TAG=""
+elif [ "$PROJECT" == "models" ]; then
+  STRIPPED_SUFFIX_FOR_TAG=""
 else
   echo "ERROR: Unknown project name $PROJECT"
   exit 1