From 167872c332d4ff8e044700854d91e3b3c6a5322f Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Feb 2025 16:10:01 +0100 Subject: [PATCH 01/21] build(Makefile): git push commits when releasing again --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 6f2c66c42..89fb315b7 100644 --- a/Makefile +++ b/Makefile @@ -84,6 +84,7 @@ release: VERSION=`./utils/version.pl -changelog CHANGELOG.md -v` ; \ git add CHANGELOG.md ; \ git commit -m "chore(release): $${VERSION}" ; \ + git push ; \ git tag $${VERSION} ; \ git push origin $${VERSION} From 7b2d2bedb7060c5c4a649ed9728b62df4b0ec348 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Feb 2025 16:11:15 +0100 Subject: [PATCH 02/21] build(docker/fradrive): chmod /usr/bin contents --- docker/fradrive/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/fradrive/Dockerfile b/docker/fradrive/Dockerfile index 85a266054..204a47bfb 100755 --- a/docker/fradrive/Dockerfile +++ b/docker/fradrive/Dockerfile @@ -27,6 +27,7 @@ RUN mkdir -p /var/log/uniworx && chown -R uniworx:uniworx /var/log/uniworx COPY ./bin/uniworx /usr/bin/uniworx COPY ./bin/uniworxdb /usr/bin/uniworxdb # COPY uniworxload /usr/bin/uniworx +RUN chmod -R 777 /usr/bin COPY ./docker/fradrive/fradrive-entrypoint.sh /entrypoint.sh RUN chmod 777 /entrypoint.sh From f23da55693ae45889c0e099d2f9b26dd8340097b Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Feb 2025 16:55:40 +0100 Subject: [PATCH 03/21] build(docker/fradrive): remove path-quoting for settings files --- docker/fradrive/fradrive-entrypoint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/fradrive/fradrive-entrypoint.sh b/docker/fradrive/fradrive-entrypoint.sh index e52506ce2..10e92f6f8 100644 --- a/docker/fradrive/fradrive-entrypoint.sh +++ b/docker/fradrive/fradrive-entrypoint.sh @@ -10,7 +10,8 @@ configDir=${CONFIG_DIR-/cfg} configs=() if [[ -d "${configDir}" ]]; then while IFS= read -d $'\0' cfg; do - configs+=("${(q)cfg}") + # IMPORTANT: The paths to the settings-yaml-files should not contain spaces, otherwise this might fail runtime! + configs+=("${cfg}") done < <(find "${configDir}" \( -name '*.yml' -o -name '*.yaml' \) -print0 | sort -rz) fi From 2eb423b4a1a9c0abbfbad9d5b2daa8f58b2d7a82 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Feb 2025 16:56:19 +0100 Subject: [PATCH 04/21] chore(release): v27.4.59-test-f0.0.14 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32e9f8238..fd74bc5d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [v27.4.59-test-f0.0.14](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.14...v27.4.59-test-f0.0.14) (2025-02-14) + ## [v27.4.59-test-e0.0.14](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.13...v27.4.59-test-e0.0.14) (2025-02-13) ## [v27.4.59-test-e0.0.13](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.12...v27.4.59-test-e0.0.13) (2025-02-12) From 81fdec5068c4b212675cede82658db1374ce5f46 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Feb 2025 21:25:39 +0100 Subject: [PATCH 05/21] build(docker/fradrive): install release runtime dependencies --- docker/fradrive/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/fradrive/Dockerfile b/docker/fradrive/Dockerfile index 204a47bfb..1323ce09b 100755 --- a/docker/fradrive/Dockerfile +++ b/docker/fradrive/Dockerfile @@ -10,8 +10,9 @@ FROM ${FROM_IMG}:${FROM_TAG} # ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 # FraDrive runtime dependencies +RUN apt-get update && apt-get -y install libsodium # TODO: minimize texlive dependencies, switch to basic schemes where possible -# RUN apt-get -y install texlive-latex-recommended texlive-latex-extra texlive-luatex texlive-fonts-recommended texlive-fonts-extra texlive-lang-english texlive-lang-german +RUN apt-get update && apt-get -y install texlive-latex-recommended texlive-latex-extra texlive-luatex texlive-fonts-recommended texlive-fonts-extra texlive-lang-english texlive-lang-german # Add uniworx user and directories RUN mkdir -p /var/lib From 2b76d673f882c40e0757e4383aa5df87f5a5dd52 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Feb 2025 21:32:49 +0100 Subject: [PATCH 06/21] ci(azure-pipelines): add build-args to release build for network access --- .azure-pipelines/templates/jobs/release.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.azure-pipelines/templates/jobs/release.yaml b/.azure-pipelines/templates/jobs/release.yaml index 36bc6acae..0ac1ec82b 100644 --- a/.azure-pipelines/templates/jobs/release.yaml +++ b/.azure-pipelines/templates/jobs/release.yaml @@ -47,6 +47,10 @@ jobs: --build-arg PROJECT_DIR=$(Build.Repository.LocalPath) \ --build-arg IN_CI=true \ --build-arg IN_CONTAINER=true \ + --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 \ + --build-arg HTTP_PROXY=http://proxy.frankfurt-airport.de:8080 \ + --build-arg NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' \ + --build-arg FRAPORT_NOPROXY=dev.azure.com,*.dev.azure.com,*.fraport.de,*.frankfurt-airport.de \ . - task: Docker@2 displayName: Push container to registry From 4d2ac71f730b179d2b07ab5463df4831229c0cc4 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Feb 2025 21:32:54 +0100 Subject: [PATCH 07/21] chore(release): v27.4.59-test-e0.0.15 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd74bc5d7..598786b10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [v27.4.59-test-e0.0.15](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.14...v27.4.59-test-e0.0.15) (2025-02-14) + ## [v27.4.59-test-f0.0.14](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.14...v27.4.59-test-f0.0.14) (2025-02-14) ## [v27.4.59-test-e0.0.14](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.13...v27.4.59-test-e0.0.14) (2025-02-13) From 497d0355d9d9d7480072010021b2c82ffe1941ca Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 15 Feb 2025 18:31:40 +0100 Subject: [PATCH 08/21] build(docker/fradrive): fix libsodium source package name --- docker/fradrive/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/fradrive/Dockerfile b/docker/fradrive/Dockerfile index 1323ce09b..a76292b72 100755 --- a/docker/fradrive/Dockerfile +++ b/docker/fradrive/Dockerfile @@ -10,7 +10,7 @@ FROM ${FROM_IMG}:${FROM_TAG} # ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 # FraDrive runtime dependencies -RUN apt-get update && apt-get -y install libsodium +RUN apt-get update && apt-get -y install libsodium-dev # TODO: minimize texlive dependencies, switch to basic schemes where possible RUN apt-get update && apt-get -y install texlive-latex-recommended texlive-latex-extra texlive-luatex texlive-fonts-recommended texlive-fonts-extra texlive-lang-english texlive-lang-german From 3dfab767617fec3282997f2350f4d2a43d2764aa Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 15 Feb 2025 18:34:41 +0100 Subject: [PATCH 09/21] build(docker/fradrive): update latex runtime dependency list --- docker/fradrive/Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/fradrive/Dockerfile b/docker/fradrive/Dockerfile index a76292b72..831df88ba 100755 --- a/docker/fradrive/Dockerfile +++ b/docker/fradrive/Dockerfile @@ -12,7 +12,13 @@ FROM ${FROM_IMG}:${FROM_TAG} # FraDrive runtime dependencies RUN apt-get update && apt-get -y install libsodium-dev # TODO: minimize texlive dependencies, switch to basic schemes where possible -RUN apt-get update && apt-get -y install texlive-latex-recommended texlive-latex-extra texlive-luatex texlive-fonts-recommended texlive-fonts-extra texlive-lang-english texlive-lang-german +RUN apt-get update && apt-get -y install \ + texlive-latex-base \ + texlive-luatex \ + texlive-fonts-recommended \ + texlive-fonts-extra \ + texlive-lang-english \ + texlive-lang-german # Add uniworx user and directories RUN mkdir -p /var/lib From c03324303858ef6c2f80f3755306ff72b702abda Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 15 Feb 2025 18:34:46 +0100 Subject: [PATCH 10/21] chore(release): v27.4.59-test-f0.0.15 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 598786b10..522f340d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [v27.4.59-test-f0.0.15](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.15...v27.4.59-test-f0.0.15) (2025-02-15) + ## [v27.4.59-test-e0.0.15](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.14...v27.4.59-test-e0.0.15) (2025-02-14) ## [v27.4.59-test-f0.0.14](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.14...v27.4.59-test-f0.0.14) (2025-02-14) From 758f4db9d8723d07d26590456bebc1159759b5d1 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 16 Feb 2025 15:30:53 +0100 Subject: [PATCH 11/21] build(docker/fradrive): set DEBIAN_FRONTEND and TZ to avoid user interaction when installing tzdata --- docker/fradrive/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/fradrive/Dockerfile b/docker/fradrive/Dockerfile index 831df88ba..0c518cc3d 100755 --- a/docker/fradrive/Dockerfile +++ b/docker/fradrive/Dockerfile @@ -10,6 +10,8 @@ FROM ${FROM_IMG}:${FROM_TAG} # ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 # FraDrive runtime dependencies +ENV DEBIAN_FRONTEND=noninteractive +ENV TZ=Etc/UTC RUN apt-get update && apt-get -y install libsodium-dev # TODO: minimize texlive dependencies, switch to basic schemes where possible RUN apt-get update && apt-get -y install \ From 3168f5c49e8ca90df743bf29baa5cbb65dd99d35 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 16 Feb 2025 15:30:58 +0100 Subject: [PATCH 12/21] chore(release): v27.4.59-test-f0.0.16 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 522f340d4..ee4c3202b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [v27.4.59-test-f0.0.16](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.15...v27.4.59-test-f0.0.16) (2025-02-16) + ## [v27.4.59-test-f0.0.15](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.15...v27.4.59-test-f0.0.15) (2025-02-15) ## [v27.4.59-test-e0.0.15](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.14...v27.4.59-test-e0.0.15) (2025-02-14) From d7e8adc24d3f1c3d9d3cebba677d00fec81e1666 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 16 Feb 2025 23:44:36 +0100 Subject: [PATCH 13/21] build(docker/fradrive): add libpq-dev runtime dependency --- docker/fradrive/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/fradrive/Dockerfile b/docker/fradrive/Dockerfile index 0c518cc3d..77f574eae 100755 --- a/docker/fradrive/Dockerfile +++ b/docker/fradrive/Dockerfile @@ -12,6 +12,7 @@ FROM ${FROM_IMG}:${FROM_TAG} # FraDrive runtime dependencies ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Etc/UTC +RUN apt-get update && apt-get -y install libpq-dev RUN apt-get update && apt-get -y install libsodium-dev # TODO: minimize texlive dependencies, switch to basic schemes where possible RUN apt-get update && apt-get -y install \ From 59985d11c21854814a42f5c725e90d614d75caa5 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 16 Feb 2025 23:44:39 +0100 Subject: [PATCH 14/21] chore(release): v27.4.59-test-g0.0.16 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee4c3202b..4c4eefc9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [v27.4.59-test-g0.0.16](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.16...v27.4.59-test-g0.0.16) (2025-02-16) + ## [v27.4.59-test-f0.0.16](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.15...v27.4.59-test-f0.0.16) (2025-02-16) ## [v27.4.59-test-f0.0.15](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.15...v27.4.59-test-f0.0.15) (2025-02-15) From 28b94351da41d744e3ccb98c5cb8183c019a0020 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 17 Feb 2025 11:26:12 +0100 Subject: [PATCH 15/21] build(docker/fradrive): simplify entrypoint --- docker/fradrive/fradrive-entrypoint.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docker/fradrive/fradrive-entrypoint.sh b/docker/fradrive/fradrive-entrypoint.sh index 10e92f6f8..9656252bd 100644 --- a/docker/fradrive/fradrive-entrypoint.sh +++ b/docker/fradrive/fradrive-entrypoint.sh @@ -4,17 +4,18 @@ cTime=$(date -Is) # export LOGDEST=/var/log/uniworx/${cTime}.log # kubernetes prefers log via stdout -typeset -a configs +# typeset -a configs configDir=${CONFIG_DIR-/cfg} -configs=() -if [[ -d "${configDir}" ]]; then - while IFS= read -d $'\0' cfg; do - # IMPORTANT: The paths to the settings-yaml-files should not contain spaces, otherwise this might fail runtime! - configs+=("${cfg}") - done < <(find "${configDir}" \( -name '*.yml' -o -name '*.yaml' \) -print0 | sort -rz) -fi +# configs=() +# if [[ -d "${configDir}" ]]; then +# while IFS= read -d $'\0' cfg; do +# # IMPORTANT: The paths to the settings-yaml-files should not contain spaces, otherwise this might fail runtime! +# configs+=("${cfg}") +# done < <(find "${configDir}" \( -name '*.yml' -o -name '*.yaml' \) -print0 | sort -rz) +# fi cd /var/lib/uniworx -exec -- uniworx ${configs} \ No newline at end of file +# exec -- uniworx ${configs} +find "${configDir}" \( -name '*.yml' -o -name '*.yaml' \) -print0 | sort -rz | xargs -0 exec -- uniworx \ No newline at end of file From bd48469b3c4e22b32d22bb94d914c99f9504f971 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 17 Feb 2025 11:26:31 +0100 Subject: [PATCH 16/21] chore(release): v27.4.59-test-f0.0.17 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c4eefc9e..5c37e5672 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [v27.4.59-test-f0.0.17](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-g0.0.16...v27.4.59-test-f0.0.17) (2025-02-17) + ## [v27.4.59-test-g0.0.16](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.16...v27.4.59-test-g0.0.16) (2025-02-16) ## [v27.4.59-test-f0.0.16](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.15...v27.4.59-test-f0.0.16) (2025-02-16) From 71a2a8e76af513245a3e671ead29d4f2c1f161de Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 18 Feb 2025 13:28:26 +0100 Subject: [PATCH 17/21] build(docker/fradrive): fix entrypoint script --- docker/fradrive/fradrive-entrypoint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/fradrive/fradrive-entrypoint.sh b/docker/fradrive/fradrive-entrypoint.sh index 9656252bd..9dd9de948 100644 --- a/docker/fradrive/fradrive-entrypoint.sh +++ b/docker/fradrive/fradrive-entrypoint.sh @@ -18,4 +18,5 @@ configDir=${CONFIG_DIR-/cfg} cd /var/lib/uniworx # exec -- uniworx ${configs} -find "${configDir}" \( -name '*.yml' -o -name '*.yaml' \) -print0 | sort -rz | xargs -0 exec -- uniworx \ No newline at end of file +# find "${configDir}" \( -name '*.yml' -o -name '*.yaml' \) -print0 | sort -rz | xargs -0 exec -- uniworx +find "${configDir}" \( -name '*.yml' -o -name '*.yaml' \) -print0 | sort -rz | xargs -0 uniworx \ No newline at end of file From 1bd02255221608ed2370e94e33e268fa16335648 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 18 Feb 2025 13:28:30 +0100 Subject: [PATCH 18/21] chore(release): v27.4.59-test-g0.0.17 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c37e5672..c2fb6b069 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [v27.4.59-test-g0.0.17](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.17...v27.4.59-test-g0.0.17) (2025-02-18) + ## [v27.4.59-test-f0.0.17](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-g0.0.16...v27.4.59-test-f0.0.17) (2025-02-17) ## [v27.4.59-test-g0.0.16](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.16...v27.4.59-test-g0.0.16) (2025-02-16) From a8420aaf56bff7202dddc998176897cc3bb62a77 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 20 Feb 2025 12:46:24 +0100 Subject: [PATCH 19/21] build(release): remove v-prefix from release versions --- utils/version.pl | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/utils/version.pl b/utils/version.pl index 4a0c6ffc1..614598d5c 100644 --- a/utils/version.pl +++ b/utils/version.pl @@ -6,8 +6,8 @@ use warnings; use Data::Dumper; # Version changes: -# v[x].[y].[z] -- Main version number -# v[x].[y].[z]-test-[branchstring]-[num] -- test/branch/devel version number +# [x].[y].[z] -- Main version number +# [x].[y].[z]-test-[branchstring]-[num] -- test/branch/devel version number # on main/master: Biggest version so far, increment by occuring changes # on other branches: find version; be it branch string, old format or main version number; # increments from there. Increment version number, but on global conflict use new version number @@ -288,7 +288,7 @@ sub vsCompare { #for($v, $w) { # $_ = parseVersion($_) unless ref $_; #} - if('v' eq $v->{prefix} and 'v' eq $w->{prefix}) { + if($v->{prefix}=~m/^v?$/ and $w->{prefix}=~m/^v?$/) { return( ($v->{major} // 0) <=> ($w->{major} // 0) || ($v->{minor} // 0) <=> ($w->{minor} // 0) || @@ -297,9 +297,9 @@ sub vsCompare { ($v->{branchversion} // 0) <=> ($w->{branchversion} // 0) || ($v->{subpatch} // '') cmp ($w->{subpatch} // '') ) - } elsif('v' eq $v->{prefix} and 'v' ne $w->{prefix}) { + } elsif($v->{prefix}=~m/^v?$/ and !$w->{prefix}=~m/^v?$/) { return 1; - } elsif('v' ne $v->{prefix} and 'v' eq $w->{prefix}) { + } elsif(!$v->{prefix}=~m/^v?$/ and $w->{prefix}=~m/^v?$/) { return -1; } else { return vsStringDebug($v) cmp vsStringDebug($w) @@ -385,7 +385,7 @@ VERSION: for my $v(@versions) { # $tag=$1; # last VERSION #} - if($v->{meta}=~m#tag\s*:\s*([vtd]b?[0-9\.]+(?:-.*)?)\)#) { + if($v->{meta}=~m#tag\s*:\s*((?:[vtd]|db|)[0-9\.]+(?:-.*)?)\)#) { $v->{version} = $1; push @versionPast, $v->{version} } @@ -479,7 +479,7 @@ sub justVersionInc { my $newVersion = undef; if($mainVersion) { - $newVersion = "v" . justVersionInc($highStart, \%reactCollect); + $newVersion = justVersionInc($highStart, \%reactCollect); } else { my $v = parseVersion($highStart); if(exists $v->{branchname}) { @@ -589,7 +589,7 @@ if($par{changelog}) { my $preVersion = ''; if(defined $sects[0] and defined $sects[0][0] and $sects[0][0]=~m/^##\s*\[([^\]\[]+)\]\(/) { $preVersion = $1; - $preVersion =~ s#^v?#v#; + # $preVersion =~ s#^v?#v#; } my $today = do { my @time = localtime; @@ -618,11 +618,3 @@ All notable changes to this project will be documented in this file. See [standa - - - - - - - - From fbd3c6d7c53ab756680f829acefb613df6e8d356 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 20 Feb 2025 13:34:13 +0100 Subject: [PATCH 20/21] build(release): make release versions compliant with semver-specifications --- utils/version.pl | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/utils/version.pl b/utils/version.pl index 614598d5c..6177e4b57 100644 --- a/utils/version.pl +++ b/utils/version.pl @@ -7,7 +7,10 @@ use Data::Dumper; # Version changes: # [x].[y].[z] -- Main version number +# XXX old # [x].[y].[z]-test-[branchstring]-[num] -- test/branch/devel version number +# XXX new +# [x].[y].[z]-[num]+[branchname] # on main/master: Biggest version so far, increment by occuring changes # on other branches: find version; be it branch string, old format or main version number; # increments from there. Increment version number, but on global conflict use new version number @@ -133,8 +136,10 @@ if($par{'h'}) { exit 0 } +my $branchNameEscaped = `$par{vcsbranch}`; +chomp $branchNameEscaped; if($par{autokind}) { - my $branch = `$par{vcsbranch}`; + my $branch = $branchNameEscaped; my @rules = split /,/, $par{autokind}; RULES: { for my $r(@rules) { @@ -151,7 +156,7 @@ if($par{autokind}) { warn "$0: No autokind rule matches; leaving the kind unchanged.\n" } } - +$branchNameEscaped =~ s/[^0-9a-zA-Z]+/-/g; if($par{'v'}) { warn "VERBOSE: Parameters\n"; @@ -232,6 +237,7 @@ sub parseVersion { $v=~m#^(?
[a-z]*)(?[0-9]+)\.(?[0-9]+)$# ||
     $v=~m#^(?
[a-z]*)(?[0-9]+)\.(?[0-9]+)\.(?

[0-9]+)$# || $v=~m#^(?

[a-z]*)(?[0-9]+)\.(?[0-9]+)\.(?

[0-9]+)-test-(?(?[a-z]+)-?(?[0-9\.]+))$# || + $v=~m#^(?

[a-z]*)(?[0-9]+)\.(?[0-9]+)\.(?

[0-9]+)-(?(?[0-9\.]+)\+(?[0-9A-Za-z\-]+))$# || # [x].[y].[z]-[num]+[branchname] $v=~m#^(?

[a-z]*)(?[0-9]+)\.(?[0-9]+)\.(?

[0-9]+)-(?.*)$# ) { %cap = %+ @@ -339,13 +345,21 @@ sub vsJustVersion { sub vsTestVersion { my $v = shift; + # [x].[y].[z]-[num]+[branchname] my $ret = - 'v' . ($v->{major} // 0) . "." . ($v->{minor} // 0) . "." . - ($v->{patch} // 0) . "-test-" . - ($v->{branchname} // 'a') . - ($v->{branchversion} // '0.0.0'); + ($v->{patch} // 0) . "-" . + ($v->{branchversion} // '0.0.0') . "+" . + $branchNameEscaped; + # old version format + #my $ret = + #'v' . + #($v->{major} // 0) . "." . + #($v->{minor} // 0) . "." . + #($v->{patch} // 0) . "-test-" . + #($v->{branchname} // 'a') . + #($v->{branchversion} // '0.0.0'); return $ret } @@ -385,8 +399,9 @@ VERSION: for my $v(@versions) { # $tag=$1; # last VERSION #} - if($v->{meta}=~m#tag\s*:\s*((?:[vtd]|db|)[0-9\.]+(?:-.*)?)\)#) { + if($v->{meta}=~m#tag\s*:\s*((?:[vtd]|db|)[0-9\.]+(?:[a-zA-Z\-\+0-9\.]*)?)[\),]#) { $v->{version} = $1; + warn "$0: Found version number in log: '$v->{version}'\n" if $par{v}; push @versionPast, $v->{version} } next if $v->{subject}=~m#^\s*(?:Merge (?:branch|remote)|Revert )#; @@ -444,8 +459,11 @@ for my $r(reverse @change) { my @allVersions = split /\n/, `$par{vcstags}`; -my @sortAll = sort {vsCompare($b, $a)} @allVersions; -my @sortSee = sort {vsCompare($b, $a)} @versionPast; +#my @sortAll = sort {vsCompare($b, $a)} @allVersions; +#my @sortSee = sort {vsCompare($b, $a)} @versionPast; +# we want the latest version and do not sort +my @sortAll = @allVersions; +my @sortSee = @versionPast; #print "all: $sortAll[0] -- see: $sortSee[0]\n"; # #print vsString($tag), "\n"; From 8198559a94022da11fa68f2daf11de397b56a4d5 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 20 Feb 2025 16:14:52 +0100 Subject: [PATCH 21/21] build(Makefile): fill uniworxdb before starting backend --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 89fb315b7..fb2d5a1b8 100644 --- a/Makefile +++ b/Makefile @@ -99,6 +99,7 @@ start: $(MAKE) start-memcached $(MAKE) start-minio $(MAKE) compile-frontend + $(MAKE) compile-uniworxdb $(MAKE) start-backend .PHONY: %-backend