Skip to content

Commit a2e8808

Browse files
committed
hibernate/hibernate-reactive#1956 Make it compatible with ORM
The Hibernate Reactive release is now compatible with the ORM scripts
1 parent a6f59e5 commit a2e8808

File tree

4 files changed

+4
-21
lines changed

4 files changed

+4
-21
lines changed

.publish.sh.swp

12 KB
Binary file not shown.

prepare-release.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pushd $WORKSPACE
4040
git config --local user.name "Hibernate CI"
4141
git config --local user.email "[email protected]"
4242

43-
if [ "$PROJECT" == "orm" ]; then
43+
if [ "$PROJECT" == "orm" ] || [ "$PROJECT" == "reactive" ]; then
4444
RELEASE_VERSION_BASIS=$(echo "$RELEASE_VERSION" | sed -E 's/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
4545
RELEASE_VERSION_FAMILY=$(echo "$RELEASE_VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
4646
"$SCRIPTS_DIR/validate-release.sh" $PROJECT $RELEASE_VERSION
@@ -54,8 +54,7 @@ if [ "$PROJECT" == "orm" ]; then
5454
-Pgradle.publish.key=$PLUGIN_PORTAL_USERNAME -Pgradle.publish.secret=$PLUGIN_PORTAL_PASSWORD \
5555
-PhibernatePublishUsername=$OSSRH_USER -PhibernatePublishPassword=$OSSRH_PASSWORD \
5656
-DsigningPassword=$RELEASE_GPG_PASSPHRASE -DsigningKeyFile=$RELEASE_GPG_PRIVATE_KEY_PATH
57-
elif [ "$PROJECT" != "reactive" ]; then
58-
# Hibernate Reactive does these checks in the `cirelease` task (called by publish.sh)
57+
else
5958
if [[ "$PROJECT" != "infra-theme" && "$PROJECT" != "infra-extensions" ]]; then
6059
# Infra projects do not have a distribution bundle archive,
6160
# hence we do not want to check the sourceforge availability as we will not be uploading anything.

publish.sh

+1-17
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ fi
7474

7575
RELEASE_VERSION_FAMILY=$(echo "$RELEASE_VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
7676

77-
if [ "$PROJECT" == "orm" ]; then
77+
if [ "$PROJECT" == "orm" ] || [ "$PROJECT" == "reactive" ]; then
7878
git config user.email [email protected]
7979
git config user.name Hibernate-CI
8080
exec_or_dry_run ./gradlew releasePerform closeAndReleaseSonatypeStagingRepository -x test --no-scan --no-daemon \
@@ -83,22 +83,6 @@ if [ "$PROJECT" == "orm" ]; then
8383
-Pgradle.publish.key=$PLUGIN_PORTAL_USERNAME -Pgradle.publish.secret=$PLUGIN_PORTAL_PASSWORD \
8484
-PhibernatePublishUsername=$OSSRH_USER -PhibernatePublishPassword=$OSSRH_PASSWORD \
8585
-DsigningPassword=$RELEASE_GPG_PASSPHRASE -DsigningKeyFile=$RELEASE_GPG_PRIVATE_KEY_PATH --stacktrace
86-
87-
elif [ "$PROJECT" == "reactive" ]; then
88-
git config user.email [email protected]
89-
git config user.name Hibernate-CI
90-
91-
# Update the project development version and create the tag for the version to be released
92-
exec_or_dry_run ./gradlew ciRelease -PreleaseVersion=$RELEASE_VERSION -PdevelopmentVersion=$DEVELOPMENT_VERSION -PgitRemote=origin -PgitBranch=$BRANCH
93-
# Create the artifacts and the documentation
94-
exec_or_dry_run ./gradlew assemble
95-
# We don't publish the documentation for snapshots
96-
if [[ $RELEASE_VERSION != *-SNAPSHOT ]]; then
97-
# Publish the documentation on hibernate.org (production branch)
98-
exec_or_dry_run ./gradlew publishDocumentation -PdocPublishBranch=production
99-
fi
100-
# Publish the artifact to OSSRH
101-
exec_or_dry_run ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -PsontaypeOssrhUser=$OSSRH_USER -PsonatypeOssrgPassword=$OSSRH_PASSWORD
10286
else
10387
bash -xe "$SCRIPTS_DIR/deploy.sh" "$PROJECT"
10488
if [[ "$PROJECT" != "infra-theme" && "$PROJECT" != "infra-extensions" ]]; then

validate-release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ else
5757
fi
5858

5959
# ORM does this as part of its prepare Gradle task
60-
if [ "$PROJECT" != "orm" ]; then
60+
if [ "$PROJECT" != "orm" ] && [ "$PROJECT" != "reactive" ]; then
6161
# Only check README updates if it's actually possible that it contains things to update
6262
if grep -Eq "^\*?Version: .*\*?$|<version>" $README
6363
then

0 commit comments

Comments
 (0)