From b8706a8f0e4841ecf6f612b03a1f7234e1b41575 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Thu, 12 Dec 2024 09:23:13 -0600 Subject: [PATCH 1/2] Use env-vars for secrets used during release for ORM and HR (Gradle builds) rather than Project properties --- publish.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/publish.sh b/publish.sh index a732b2c..553955e 100755 --- a/publish.sh +++ b/publish.sh @@ -23,6 +23,7 @@ function exec_or_dry_run() { "${@}" } PUSH_CHANGES=true +DRY_RUN=false while getopts 'dhb:' opt; do case "$opt" in @@ -33,6 +34,7 @@ while getopts 'dhb:' opt; do d) # Dry run echo "DRY RUN: will not push/deploy/publish anything." + DRY_RUN=true PUSH_CHANGES=false function exec_or_dry_run() { echo "DRY RUN; would have executed:" "${@}" @@ -77,12 +79,16 @@ RELEASE_VERSION_FAMILY=$(echo "$RELEASE_VERSION" | sed -E 's/^([0-9]+\.[0-9]+).* if [ "$PROJECT" == "orm" ] || [ "$PROJECT" == "reactive" ]; then git config user.email ci@hibernate.org git config user.name Hibernate-CI - exec_or_dry_run ./gradlew releasePerform closeAndReleaseSonatypeStagingRepository -x test --no-scan --no-daemon --no-build-cache \ - -PreleaseVersion=$RELEASE_VERSION -PdevelopmentVersion=$DEVELOPMENT_VERSION -PgitRemote=origin -PgitBranch=$BRANCH -PdocPublishBranch=production \ - -PSONATYPE_OSSRH_USER=$OSSRH_USER -PSONATYPE_OSSRH_PASSWORD=$OSSRH_PASSWORD \ - -Pgradle.publish.key=$PLUGIN_PORTAL_USERNAME -Pgradle.publish.secret=$PLUGIN_PORTAL_PASSWORD \ - -PhibernatePublishUsername=$OSSRH_USER -PhibernatePublishPassword=$OSSRH_PASSWORD \ - -DsigningPassword=$RELEASE_GPG_PASSPHRASE -DsigningKeyFile=$RELEASE_GPG_PRIVATE_KEY_PATH --stacktrace + + EXTRA_ARGS="" + if [ "$DRY_RUN" == "true" ]; 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 else bash -xe "$SCRIPTS_DIR/deploy.sh" "$PROJECT" if [[ "$PROJECT" != "tools" && "$PROJECT" != "hcann" && ! $PROJECT =~ ^infra-.+ ]]; then From d4406acbbe5b24b75b6ee24644eca062a112b063 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Thu, 12 Dec 2024 12:15:36 -0600 Subject: [PATCH 2/2] Use env-vars for secrets used during release for ORM and HR (Gradle builds) rather than Project properties --- prepare-release.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/prepare-release.sh b/prepare-release.sh index 9a73be3..a97ea11 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -49,11 +49,8 @@ if [ "$PROJECT" == "orm" ] || [ "$PROJECT" == "reactive" ]; then # tags the version # changes the version to the provided development version ./gradlew clean releasePrepare -x test --no-scan --no-daemon --no-build-cache \ - -PreleaseVersion=$RELEASE_VERSION -PdevelopmentVersion=$DEVELOPMENT_VERSION -PgitRemote=origin -PgitBranch=$BRANCH -PdocPublishBranch="production" \ - -PSONATYPE_OSSRH_USER=$OSSRH_USER -PSONATYPE_OSSRH_PASSWORD=$OSSRH_PASSWORD \ - -Pgradle.publish.key=$PLUGIN_PORTAL_USERNAME -Pgradle.publish.secret=$PLUGIN_PORTAL_PASSWORD \ - -PhibernatePublishUsername=$OSSRH_USER -PhibernatePublishPassword=$OSSRH_PASSWORD \ - -DsigningPassword=$RELEASE_GPG_PASSPHRASE -DsigningKeyFile=$RELEASE_GPG_PRIVATE_KEY_PATH + -PreleaseVersion=$RELEASE_VERSION -PdevelopmentVersion=$DEVELOPMENT_VERSION + -PgitRemote=origin else if [[ "$PROJECT" != "tools" && "$PROJECT" != "hcann" && ! $PROJECT =~ ^infra-.+ ]]; then # These projects do not have a distribution bundle archive,