From 117959234ef0a30bda60184abb62214c337ef52ff27b6c041e306d1e536f90bc Mon Sep 17 00:00:00 2001 From: "Marc S. Weidner" Date: Tue, 7 Oct 2025 14:00:34 +0100 Subject: [PATCH] V8.13.064.2025.10.07 Signed-off-by: Marc S. Weidner --- .gitea/trigger/t_generate_PRIVATE_trixie_1.yaml | 2 +- .gitea/workflows/generate_PRIVATE_trixie_0.yaml | 5 +++++ .gitea/workflows/generate_PRIVATE_trixie_1.yaml | 5 +++++ .gitea/workflows/generate_PUBLIC_iso.yaml | 5 +++++ .gitea/workflows/linter_char_scripts.yaml | 4 ++++ .gitea/workflows/render-dnssec-status.yaml | 4 ++++ .gitea/workflows/render-dot-to-png.yaml | 4 ++++ docs/CHANGELOG.md | 5 +++++ lib/lib_note_target.sh | 5 ++++- lib/lib_run_analysis.sh | 5 ++++- 10 files changed, 41 insertions(+), 3 deletions(-) diff --git a/.gitea/trigger/t_generate_PRIVATE_trixie_1.yaml b/.gitea/trigger/t_generate_PRIVATE_trixie_1.yaml index 8f50145..c5d7ab9 100644 --- a/.gitea/trigger/t_generate_PRIVATE_trixie_1.yaml +++ b/.gitea/trigger/t_generate_PRIVATE_trixie_1.yaml @@ -10,6 +10,6 @@ # SPDX-Security-Contact: security@coresecret.eu build: - counter: 1023 + counter: 1024 version: V8.13.064.2025.10.07 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=yaml diff --git a/.gitea/workflows/generate_PRIVATE_trixie_0.yaml b/.gitea/workflows/generate_PRIVATE_trixie_0.yaml index 10c13db..be7d7fc 100644 --- a/.gitea/workflows/generate_PRIVATE_trixie_0.yaml +++ b/.gitea/workflows/generate_PRIVATE_trixie_0.yaml @@ -63,6 +63,11 @@ jobs: - name: ⚙️ Preparing SSH Setup, SSH Deploy Key, Known Hosts, .config. shell: bash run: | + set -euo pipefail + var_wait=$(( RANDOM % 33 )) + printf "⏳ Waiting %s seconds to desynchronize parallel workflows...\n" "{$var_wait}" + sleep "{$var_wait}" + rm -rf ~/.ssh && mkdir -m700 ~/.ssh ### Private Key diff --git a/.gitea/workflows/generate_PRIVATE_trixie_1.yaml b/.gitea/workflows/generate_PRIVATE_trixie_1.yaml index 386d38d..a9f9114 100644 --- a/.gitea/workflows/generate_PRIVATE_trixie_1.yaml +++ b/.gitea/workflows/generate_PRIVATE_trixie_1.yaml @@ -63,6 +63,11 @@ jobs: - name: ⚙️ Preparing SSH Setup, SSH Deploy Key, Known Hosts, .config. shell: bash run: | + set -euo pipefail + var_wait=$(( RANDOM % 33 )) + printf "⏳ Waiting %s seconds to desynchronize parallel workflows...\n" "{$var_wait}" + sleep "{$var_wait}" + rm -rf ~/.ssh && mkdir -m700 ~/.ssh ### Private Key diff --git a/.gitea/workflows/generate_PUBLIC_iso.yaml b/.gitea/workflows/generate_PUBLIC_iso.yaml index 69665c4..c5029cc 100644 --- a/.gitea/workflows/generate_PUBLIC_iso.yaml +++ b/.gitea/workflows/generate_PUBLIC_iso.yaml @@ -62,6 +62,11 @@ jobs: - name: ⚙️ Preparing SSH Setup, SSH Deploy Key, Known Hosts, .config. shell: bash run: | + set -euo pipefail + var_wait=$(( RANDOM % 33 )) + printf "⏳ Waiting %s seconds to desynchronize parallel workflows...\n" "{$var_wait}" + sleep "{$var_wait}" + rm -rf ~/.ssh && mkdir -m700 ~/.ssh ### Private Key diff --git a/.gitea/workflows/linter_char_scripts.yaml b/.gitea/workflows/linter_char_scripts.yaml index ae182bf..728b7fd 100644 --- a/.gitea/workflows/linter_char_scripts.yaml +++ b/.gitea/workflows/linter_char_scripts.yaml @@ -41,6 +41,10 @@ jobs: shell: bash run: | set -euo pipefail + var_wait=$(( RANDOM % 33 )) + printf "⏳ Waiting %s seconds to desynchronize parallel workflows...\n" "{$var_wait}" + sleep "{$var_wait}" + rm -rf ~/.ssh && mkdir -m700 ~/.ssh ### Private Key diff --git a/.gitea/workflows/render-dnssec-status.yaml b/.gitea/workflows/render-dnssec-status.yaml index b12c4ab..030cc0d 100644 --- a/.gitea/workflows/render-dnssec-status.yaml +++ b/.gitea/workflows/render-dnssec-status.yaml @@ -33,6 +33,10 @@ jobs: shell: bash run: | set -euo pipefail + var_wait=$(( RANDOM % 33 )) + printf "⏳ Waiting %s seconds to desynchronize parallel workflows...\n" "{$var_wait}" + sleep "{$var_wait}" + rm -rf ~/.ssh && mkdir -m700 ~/.ssh ### Private Key diff --git a/.gitea/workflows/render-dot-to-png.yaml b/.gitea/workflows/render-dot-to-png.yaml index 681e306..8ea5a82 100644 --- a/.gitea/workflows/render-dot-to-png.yaml +++ b/.gitea/workflows/render-dot-to-png.yaml @@ -34,6 +34,10 @@ jobs: shell: bash run: | set -euo pipefail + var_wait=$(( RANDOM % 33 )) + printf "⏳ Waiting %s seconds to desynchronize parallel workflows...\n" "{$var_wait}" + sleep "{$var_wait}" + rm -rf ~/.ssh && mkdir -m700 ~/.ssh ### Private Key diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index c72f016..9c931d7 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -15,10 +15,15 @@ include_toc: true ## V8.13.064.2025.10.07 * **Added**: Verbose status information screen on successful completion. * **Added**: Verbose status information in 'CISS.debian.live.iso.' +* **Added**: Loop to desynchronize parallel workflows. +* **Added**: [lib_note_target.sh](../lib/lib_note_target.sh) +* **Updated**: [lib_trap_on_err.sh](../lib/lib_trap_on_err.sh) +* **Updated**: [lib_trap_on_exit.sh](../lib/lib_trap_on_exit.sh) * **Updated**: [9000-cdi-starter](../scripts/9000-cdi-starter) * **Updated**: [9980_usb_guard.chroot](../config/hooks/live/9980_usb_guard.chroot) * **Updated**: [lib_cdi.sh](../lib/lib_cdi.sh) Unified Kernel bootparameter. * **Updated**: [lib_lb_config_write_trixie.sh](../lib/lib_lb_config_write_trixie.sh) Unified Kernel bootparameter. +* **Updated**: [lib_run_analysis.sh](../lib/lib_run_analysis.sh) ## V8.13.048.2025.10.06 * **Updated**: Debian 13 LIVE ISO workflows to use Kernel: ``6.16.3+deb13-amd64`` diff --git a/lib/lib_note_target.sh b/lib/lib_note_target.sh index a4228d1..7c44e08 100644 --- a/lib/lib_note_target.sh +++ b/lib/lib_note_target.sh @@ -20,6 +20,7 @@ # 0: on success ####################################### note_target() { + printf "\e[95m++++ ++++ ++++ ++++ ++++ ++++ ++ 🧪 %s starting ... \e[0m\n" "${BASH_SOURCE[0]}" cat << EOF >| "${VAR_HANDLER_BUILD_DIR}/config/includes.chroot/root/cdlb.txt" ################################################################################ @@ -42,7 +43,7 @@ note_target() { Please file bugs @ https://git.coresecret.dev/msw/CISS.debian.live.builder/issues - Contact + Contact: https://coresecret.eu/ security@coresecret.eu PGP Key 2D98 07F4 1030 1776 597E BDC9 9F54 8853 35A3 C9AD @@ -53,6 +54,8 @@ note_target() { ################################################################################ EOF + printf "\e[92m++++ ++++ ++++ ++++ ++++ ++++ ++ ✅ %s successfully applied. \e[0m\n" "${BASH_SOURCE[0]}" + return 0 } ### Prevents accidental 'unset -f'. diff --git a/lib/lib_run_analysis.sh b/lib/lib_run_analysis.sh index d286a0b..012307a 100644 --- a/lib/lib_run_analysis.sh +++ b/lib/lib_run_analysis.sh @@ -17,6 +17,7 @@ guard_sourcing # Globals: # VAR_BUILD_LOG # VAR_CHROOT_DIR +# VAR_HANDLER_AUTOBUILD # VAR_HANDLER_BUILD_DIR # VAR_PACKAGES_FILE # Arguments: @@ -26,9 +27,11 @@ guard_sourcing # ERR_UNCRITICAL: on failure ####################################### run_analysis() { - clear + if ! ${VAR_HANDLER_AUTOBUILD}; then clear; fi + # shellcheck disable=SC2164 cd "${VAR_HANDLER_BUILD_DIR}" + # shellcheck disable=SC2155 declare iso_file=$(find . -maxdepth 1 -name "*.iso" -printf "%f\n" | sort | tail -n1)