You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2025/07/31 15:29:42 UTC
(plc4x) branch develop updated (76e8fa0513 -> eb1d640ff8)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from 76e8fa0513 chore: Continued working on the release scripts.
new e84cde9a2e chore: Continued working on the release scripts.
new eb1d640ff8 chore: Continued working on the release scripts.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tools/release-0-update-generated-code.sh | 16 ++++++++--------
tools/release-1-create-branch.sh | 2 +-
tools/release-2-prepare-release.sh | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
(plc4x) 01/02: chore: Continued working on the release scripts.
Posted by cd...@apache.org.
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 <ch...@c-ware.de>
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
(plc4x) 02/02: chore: Continued working on the release scripts.
Posted by cd...@apache.org.
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 eb1d640ff8cb07907a1c820a4df208e3cc576926
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Jul 31 17:29:34 2025 +0200
chore: Continued working on the release scripts.
---
tools/release-0-update-generated-code.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/release-0-update-generated-code.sh b/tools/release-0-update-generated-code.sh
index 51967449a6..899b7e0bdc 100755
--- a/tools/release-0-update-generated-code.sh
+++ b/tools/release-0-update-generated-code.sh
@@ -72,7 +72,7 @@ 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 {} \;
+ find "$SRC_DIR" -type f -exec rm {} \;
fi
done
# Delete the PLC4C code (local)
@@ -80,7 +80,7 @@ echo " - Deleting: $DIRECTORY/plc4c/generated-sources"
rm -r "$DIRECTORY/plc4c/generated-sources"
# Delete the PLC4Go code (local)
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 {} \;
+find "$DIRECTORY/plc4go/protocols" -mindepth 2 -type f ! \( -name 'StaticHelper.go' -o -name 'StaticHelper_test.go' \) -exec rm {} \;
# Delete the PLC4Net code (local)
echo " - Deleting: generated files in $DIRECTORY/plc4net/drivers"
for dir in "$DIRECTORY/plc4net/drivers"/*; do
@@ -89,19 +89,19 @@ for dir in "$DIRECTORY/plc4net/drivers"/*; do
SRC_DIR="$dir/src"
if [[ -d "$SRC_DIR" ]]; then
echo "🧹 Deleting files in: $SRC_DIR"
- find "$SRC_DIR" -type f -exec rm -v {} \;
+ find "$SRC_DIR" -type f -exec rm {} \;
fi
else
SRC_DIR="$dir/resources"
if [[ -d "$SRC_DIR" ]]; then
echo "🧹 Deleting files in: $SRC_DIR"
- find "$SRC_DIR" -type f -exec rm -v {} \;
+ find "$SRC_DIR" -type f -exec rm {} \;
fi
fi
done
# Delete the PLC4Py code (local)
echo " - Deleting: generated files in $DIRECTORY/plc4py/plc4py/protocols"
-find "$DIRECTORY/plc4py/plc4py/protocols" -mindepth 2 -type f ! \( -name '__init__.py' -o -name 'StaticHelper.py' \) -exec rm -v {} \;
+find "$DIRECTORY/plc4py/plc4py/protocols" -mindepth 2 -type f ! \( -name '__init__.py' -o -name 'StaticHelper.py' \) -exec rm {} \;
########################################################################################################################
# 4. Make sure the NOTICE file has the current year in the second line