Skip to content

Commit

Permalink
fix re-version.sh to accept release from specific branches (#4973)
Browse files Browse the repository at this point in the history
fix(re-version.sh): add validation for branch name argument to prevent missing argument error
fix(create-release.yml): pass branch name argument to re-version.sh script to correctly update commercial jars
  • Loading branch information
jandroav committed Sep 28, 2023
1 parent 9138b73 commit 5cd3e8e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
16 changes: 11 additions & 5 deletions .github/util/re-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@ set -e
set -x

if [ -z ${1+x} ]; then
echo "This script requires the path to unzipped liquibase-artifacts to be passed to it. Example: re-version.sh /path/to/liquibase-artifacts 4.5.0";
echo "This script requires the path to unzipped liquibase-artifacts to be passed to it. Example: re-version.sh /path/to/liquibase-artifacts 4.24.0 release_4_24_0";
exit 1;
fi

if [ -z ${2+x} ]; then
echo "This script requires the version to be passed to it. Example: re-version.sh /path/to/liquibase-artifacts 4.5.0";
echo "This script requires the version to be passed to it. Example: re-version.sh /path/to/liquibase-artifacts 4.24.0 release_4_24_0";
exit 1;
fi

if [ -z ${3+x} ]; then
echo "This script requires the name of the branch from which the version is released to be passed to it. Example: re-version.sh /path/to/liquibase-artifacts 4.24.0 release_4_24_0";
exit 1;
fi

Expand All @@ -33,6 +38,7 @@ rm case-test-*

workdir=$(readlink -m $1)
version=$2
branch=$3
scriptDir="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"

outdir=$(pwd)/re-version/out
Expand All @@ -43,7 +49,7 @@ mkdir -p $outdir
(cd $scriptDir && javac ManifestReversion.java)

#### Update jars
declare -a jars=("liquibase-core-0-SNAPSHOT.jar" "liquibase-core-0-SNAPSHOT-sources.jar" "liquibase-commercial-master-SNAPSHOT.jar" "liquibase-commercial-master-SNAPSHOT-sources.jar" "liquibase-cdi-0-SNAPSHOT.jar" "liquibase-cdi-0-SNAPSHOT-sources.jar" "liquibase-cdi-jakarta-0-SNAPSHOT.jar" "liquibase-cdi-jakarta-0-SNAPSHOT-sources.jar" "liquibase-maven-plugin-0-SNAPSHOT.jar" "liquibase-maven-plugin-0-SNAPSHOT-sources.jar")
declare -a jars=("liquibase-core-0-SNAPSHOT.jar" "liquibase-core-0-SNAPSHOT-sources.jar" "liquibase-commercial-$branch.jar" "liquibase-commercial-$branch-sources.jar" "liquibase-cdi-0-SNAPSHOT.jar" "liquibase-cdi-0-SNAPSHOT-sources.jar" "liquibase-cdi-jakarta-0-SNAPSHOT.jar" "liquibase-cdi-jakarta-0-SNAPSHOT-sources.jar" "liquibase-maven-plugin-0-SNAPSHOT.jar" "liquibase-maven-plugin-0-SNAPSHOT-sources.jar")

for jar in "${jars[@]}"
do
Expand All @@ -58,7 +64,7 @@ do
rm -rf $workdir/META-INF

## Fix up liquibase.build.properties
if [[ $jar == "liquibase-core-0-SNAPSHOT.jar" || $jar == "liquibase-commercial-master-SNAPSHOT.jar" ]]; then
if [[ $jar == "liquibase-core-0-SNAPSHOT.jar" || $jar == "liquibase-commercial-$branch.jar" ]]; then
unzip -q $workdir/$jar liquibase.build.properties -d $workdir
sed -i -e "s/build.version=.*/build.version=$version/" $workdir/liquibase.build.properties
(cd $workdir && jar -uf $jar liquibase.build.properties)
Expand All @@ -83,7 +89,7 @@ do
done

#### Update javadoc jars
declare -a javadocJars=("liquibase-core-0-SNAPSHOT-javadoc.jar" "liquibase-cdi-0-SNAPSHOT-javadoc.jar" "liquibase-cdi-jakarta-0-SNAPSHOT-javadoc.jar" "liquibase-maven-plugin-0-SNAPSHOT-javadoc.jar" "liquibase-commercial-master-SNAPSHOT-javadoc.jar")
declare -a javadocJars=("liquibase-core-0-SNAPSHOT-javadoc.jar" "liquibase-cdi-0-SNAPSHOT-javadoc.jar" "liquibase-cdi-jakarta-0-SNAPSHOT-javadoc.jar" "liquibase-maven-plugin-0-SNAPSHOT-javadoc.jar" "liquibase-commercial-$branch-javadoc.jar")

for jar in "${javadocJars[@]}"
do
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
env:
GPG_PASSWORD: ${{ secrets.GPG_PASSPHRASE }}
run: |
.github/util/re-version.sh download/liquibase-artifacts "${{ needs.setup.outputs.version }}"
.github/util/re-version.sh download/liquibase-artifacts "${{ needs.setup.outputs.version }}" "${{ steps.collect-data.outputs.branch }}"
##Sign Files
.github/util/sign-artifacts.sh re-version/out
Expand Down

0 comments on commit 5cd3e8e

Please sign in to comment.