This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit e84cde9a2ed0ff9ad8b24fe3690723ff7eae41f0 Author: Christofer Dutz <[email protected]> AuthorDate: Thu Jul 31 17:27:28 2025 +0200 chore: Continued working on the release scripts. --- tools/release-0-update-generated-code.sh | 6 +++--- tools/release-1-create-branch.sh | 2 +- tools/release-2-prepare-release.sh | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/release-0-update-generated-code.sh b/tools/release-0-update-generated-code.sh index fd5893d561..51967449a6 100755 --- a/tools/release-0-update-generated-code.sh +++ b/tools/release-0-update-generated-code.sh @@ -128,12 +128,12 @@ fi # 5 Run the maven build for all modules with "update-generated-code" enabled (Docker container) ######################################################################################################################## -if ! docker compose -f "$DIRECTORY/tools/docker-compose.yml" build; then +if ! docker compose -f "$DIRECTORY/tools/docker-compose.yaml" build; then echo "❌ Got non-0 exit code from building the release docker container, aborting." exit 1 fi -if ! docker compose -f "$DIRECTORY/tools/docker-compose.yml" run releaser bash /ws/mvnw -e -P with-c,with-dotnet,with-go,with-java,with-python,enable-all-checks,update-generated-code -Dmaven.repo.local=/ws/out/.repository clean package -DskipTests; then +if ! docker compose -f "$DIRECTORY/tools/docker-compose.yaml" run releaser bash /ws/mvnw -e -P with-c,with-dotnet,with-go,with-java,with-python,enable-all-checks,update-generated-code -Dmaven.repo.local=/ws/out/.repository clean package -DskipTests; then echo "❌ Got non-0 exit code from running the code-generation inside docker, aborting." exit 1 fi @@ -142,7 +142,7 @@ fi # 6. Make sure the generated driver documentation is up-to-date. ######################################################################################################################## -if ! docker compose -f "$DIRECTORY/tools/docker-compose.yml" run releaser bash /ws/mvnw -e -P with-java -Dmaven.repo.local=/ws/out/.repository clean site -pl :plc4j-driver-all; then +if ! docker compose -f "$DIRECTORY/tools/docker-compose.yaml" run releaser bash /ws/mvnw -e -P with-java -Dmaven.repo.local=/ws/out/.repository clean site -pl :plc4j-driver-all; then echo "❌ Got non-0 exit code from running the site code-generation inside docker, aborting." exit 1 fi diff --git a/tools/release-1-create-branch.sh b/tools/release-1-create-branch.sh index a9d75527d6..1f8bd90d36 100755 --- a/tools/release-1-create-branch.sh +++ b/tools/release-1-create-branch.sh @@ -63,7 +63,7 @@ esac # 4. Do a simple maven branch command with pushChanges=false ######################################################################################################################## -if ! docker compose -f "$DIRECTORY/tools/docker-compose.yml" run releaser bash /ws/mvnw -e -P with-c,with-dotnet,with-go,with-java,with-python,enable-all-checks,update-generated-code -Dmaven.repo.local=/ws/out/.repository release:branch -DautoVersionSubmodules=true -DpushChanges=false -DdevelopmentVersion="$NEW_VERSION" -DbranchName="$BRANCH_NAME"; then +if ! docker compose -f "$DIRECTORY/tools/docker-compose.yaml" run releaser bash /ws/mvnw -e -P with-c,with-dotnet,with-go,with-java,with-python,enable-all-checks,update-generated-code -Dmaven.repo.local=/ws/out/.repository release:branch -DautoVersionSubmodules=true -DpushChanges=false -DdevelopmentVersion="$NEW_VERSION" -DbranchName="$BRANCH_NAME"; then echo "❌ Got non-0 exit code from docker compose, aborting." exit 1 fi diff --git a/tools/release-2-prepare-release.sh b/tools/release-2-prepare-release.sh index 8793a06729..f67ad11af2 100755 --- a/tools/release-2-prepare-release.sh +++ b/tools/release-2-prepare-release.sh @@ -40,7 +40,7 @@ NEW_VERSION="${VERSION_SEGMENTS[0]}.${VERSION_SEGMENTS[1]}.$((VERSION_SEGMENTS[2 # 1. Do a simple release-prepare command ######################################################################################################################## -if ! docker compose -f "$DIRECTORY/tools/docker-compose.yml" run releaser bash /ws/mvnw -e -P with-c,with-dotnet,with-go,with-java,with-python,enable-all-checks,update-generated-code -Dmaven.repo.local=/ws/out/.repository release:prepare -DautoVersionSubmodules=true -DreleaseVersion="$RELEASE_VERSION" -DdevelopmentVersion="$NEW_VERSION" -Dtag="v$RELEASE_VERSION"; then +if ! docker compose -f "$DIRECTORY/tools/docker-compose.yaml" run releaser bash /ws/mvnw -e -P with-c,with-dotnet,with-go,with-java,with-python,enable-all-checks,update-generated-code -Dmaven.repo.local=/ws/out/.repository release:prepare -DautoVersionSubmodules=true -DreleaseVersion="$RELEASE_VERSION" -DdevelopmentVersion="$NEW_VERSION" -Dtag="v$RELEASE_VERSION"; then echo "❌ Got non-0 exit code from docker compose, aborting." exit 1 fi @@ -59,8 +59,8 @@ fi ######################################################################################################################## echo "Performing Release:" -#docker compose -f "$DIRECTORY/tools/docker-compose.yml" build -if ! docker compose -f "$DIRECTORY/tools/docker-compose.yml" run releaser bash /ws/mvnw -e -Dmaven.repo.local=/ws/out/.repository -DaltDeploymentRepository=snapshot-repo::default::file:/ws/out/.local-artifacts-dir release:perform; then +#docker compose -f "$DIRECTORY/tools/docker-compose.yaml" build +if ! docker compose -f "$DIRECTORY/tools/docker-compose.yaml" run releaser bash /ws/mvnw -e -Dmaven.repo.local=/ws/out/.repository -DaltDeploymentRepository=snapshot-repo::default::file:/ws/out/.local-artifacts-dir release:perform; then echo "❌ Got non-0 exit code from docker compose, aborting." exit 1 fi
