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
The following commit(s) were added to refs/heads/develop by this push:
new 76e8fa0513 chore: Continued working on the release scripts.
76e8fa0513 is described below
commit 76e8fa05133f8f70e621abc03d96afc935ce9bba
Author: Christofer Dutz <[email protected]>
AuthorDate: Thu Jul 31 17:25:29 2025 +0200
chore: Continued working on the release scripts.
---
tools/release-0-update-generated-code.sh | 21 +++++++++++++--------
tools/release-1-create-branch.sh | 2 +-
tools/release-2-prepare-release.sh | 6 +++---
3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/tools/release-0-update-generated-code.sh
b/tools/release-0-update-generated-code.sh
index 59ea22a2ce..fd5893d561 100755
--- a/tools/release-0-update-generated-code.sh
+++ b/tools/release-0-update-generated-code.sh
@@ -59,22 +59,27 @@ fi
########################################################################################################################
echo "Deleting the maven local repo and previous deployments"
-rm -r $DIRECTORY/out
+rm -r "$DIRECTORY/out"
########################################################################################################################
# 3. Delete all generated sources (local)
########################################################################################################################
echo "Deleting generated-sources:"
-find "$DIRECTORY" -path "*/src/main/generated" -print0 | while IFS= read -r -d
'' f; do
- echo " - Deleting: $f"
- rm -r "$f"
+# Delete the PLC4J code (local)
+echo " - Deleting: $DIRECTORY/plc4j/**"
+for dir in "$DIRECTORY/plc4j/drivers"/*; do
+ SRC_DIR="$dir/src/main/generated"
+ if [[ -d "$SRC_DIR" ]]; then
+ echo "๐งน Deleting files in: $SRC_DIR"
+ find "$SRC_DIR" -type f -exec rm -v {} \;
+ fi
done
# Delete the PLC4C code (local)
echo " - Deleting: $DIRECTORY/plc4c/generated-sources"
rm -r "$DIRECTORY/plc4c/generated-sources"
# Delete the PLC4Go code (local)
-echo " - Deleting: generated files in $DIRECTORY/plc4c/generated-sources"
+echo " - Deleting: generated files in $DIRECTORY/plc4go/protocols"
find "$DIRECTORY/plc4go/protocols" -mindepth 2 -type f ! \( -name
'StaticHelper.go' -o -name 'StaticHelper_test.go' \) -exec rm -v {} \;
# Delete the PLC4Net code (local)
echo " - Deleting: generated files in $DIRECTORY/plc4net/drivers"
@@ -123,12 +128,12 @@ fi
# 5 Run the maven build for all modules with "update-generated-code" enabled
(Docker container)
########################################################################################################################
-if ! docker -f "$DIRECTORY/tools/docker-compose.yml" compose build; then
+if ! docker compose -f "$DIRECTORY/tools/docker-compose.yml" build; then
echo "โ Got non-0 exit code from building the release docker container,
aborting."
exit 1
fi
-if ! docker -f "$DIRECTORY/tools/docker-compose.yml" compose 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.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
echo "โ Got non-0 exit code from running the code-generation inside
docker, aborting."
exit 1
fi
@@ -137,7 +142,7 @@ fi
# 6. Make sure the generated driver documentation is up-to-date.
########################################################################################################################
-if ! docker -f "$DIRECTORY/tools/docker-compose.yml" compose 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.yml" 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 f416428758..a9d75527d6 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 -f "$DIRECTORY/tools/docker-compose.yml" compose 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.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
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 f66cef3d3b..8793a06729 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 -f "$DIRECTORY/tools/docker-compose.yml" compose 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.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
echo "โ Got non-0 exit code from docker compose, aborting."
exit 1
fi
@@ -59,8 +59,8 @@ fi
########################################################################################################################
echo "Performing Release:"
-docker -f "$DIRECTORY/tools/docker-compose.yml" compose build
-if ! docker compose 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.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
echo "โ Got non-0 exit code from docker compose, aborting."
exit 1
fi
