From 33d6cd1cfd254c9fb9f08244b9fcc78105af5d04 Mon Sep 17 00:00:00 2001 From: Albrecht Degering Date: Thu, 3 Sep 2026 17:28:10 +0200 Subject: [PATCH] v0.20.5 additional commit --- .env.example | 2 +- Containerfile.release | 2 +- compose.example.yaml | 2 +- compose.yaml | 6 +++--- package.json | 2 +- release.sh | 6 ++++++ release/toolbox.lock.json | 8 ++++---- scripts/release.sh | 7 +++++++ scripts/update-release-lock.mjs | 10 ++++------ 9 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 release.sh diff --git a/.env.example b/.env.example index efc3cf3..03fd100 100644 --- a/.env.example +++ b/.env.example @@ -5,5 +5,5 @@ TRAEFIK_NETWORK=internal TRAEFIK_CERT_RESOLVER=netcup # Keep these two values paired when deploying a newer published toolbox release. -TOOLBOX_RELEASE_VERSION=0.20.3 +TOOLBOX_RELEASE_VERSION=0.20.5 TOOLBOX_RELEASE_SHA256=1e743fda8f6d1ca5c77798029351585bf6673a3410892d27e5ad17c9f6bcf0bf diff --git a/Containerfile.release b/Containerfile.release index 4f2867a..6760bfc 100644 --- a/Containerfile.release +++ b/Containerfile.release @@ -2,7 +2,7 @@ ARG NGINX_IMAGE=nginxinc/nginx-unprivileged:1.31.3-alpine@sha256:18d67281256ded3 FROM ${NGINX_IMAGE} AS release -ARG TOOLBOX_RELEASE_VERSION=0.20.3 +ARG TOOLBOX_RELEASE_VERSION=0.20.5 ARG TOOLBOX_RELEASE_SHA256=1e743fda8f6d1ca5c77798029351585bf6673a3410892d27e5ad17c9f6bcf0bf ARG TOOLBOX_RELEASE_BASE_URL=https://git.add-ideas.de/lotobo/toolbox-portal/releases/download diff --git a/compose.example.yaml b/compose.example.yaml index 99d2132..23f17f8 100644 --- a/compose.example.yaml +++ b/compose.example.yaml @@ -3,7 +3,7 @@ services: build: context: . dockerfile: Containerfile - image: git.add-ideas.de/lotobo/toolbox:0.20.3 + image: git.add-ideas.de/lotobo/toolbox:0.20.5 restart: unless-stopped read_only: true ports: diff --git a/compose.yaml b/compose.yaml index b219e29..b865b15 100644 --- a/compose.yaml +++ b/compose.yaml @@ -6,9 +6,9 @@ services: context: . dockerfile: Containerfile.release args: - TOOLBOX_RELEASE_VERSION: "${TOOLBOX_RELEASE_VERSION:-0.20.3}" - TOOLBOX_RELEASE_SHA256: "${TOOLBOX_RELEASE_SHA256:-66f02f95092ef80b9e49cda91c8401400e2ee1d2c640ab20a3a7810bf265c2c7}" - image: "git.add-ideas.de/lotobo/toolbox:${TOOLBOX_RELEASE_VERSION:-0.20.3}" + TOOLBOX_RELEASE_VERSION: "${TOOLBOX_RELEASE_VERSION:-0.20.5}" + TOOLBOX_RELEASE_SHA256: "${TOOLBOX_RELEASE_SHA256:-1e743fda8f6d1ca5c77798029351585bf6673a3410892d27e5ad17c9f6bcf0bf}" + image: "git.add-ideas.de/lotobo/toolbox:${TOOLBOX_RELEASE_VERSION:-0.20.5}" restart: unless-stopped read_only: true tmpfs: diff --git a/package.json b/package.json index 98c9c2e..319e41d 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "assemble": "node scripts/assemble.mjs", "package:static": "node scripts/package-static.mjs", "release:update": "node scripts/update-release-lock.mjs", - "release": "scripts/release.sh" + "release": "./release.sh" }, "dependencies": { "@add-ideas/toolbox-contract": "^0.3.0", diff --git a/release.sh b/release.sh new file mode 100644 index 0000000..e8283ae --- /dev/null +++ b/release.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +exec "${SCRIPT_DIR}/scripts/release.sh" "$@" diff --git a/release/toolbox.lock.json b/release/toolbox.lock.json index c602762..b928022 100644 --- a/release/toolbox.lock.json +++ b/release/toolbox.lock.json @@ -1,7 +1,7 @@ { "$schema": "./toolbox-release-lock.schema.json", "schemaVersion": 1, - "releaseVersion": "0.20.3", + "releaseVersion": "0.20.5", "portalVersion": "0.2.23", "catalogue": { "id": "de.add-ideas.toolbox", @@ -190,9 +190,9 @@ }, { "id": "de.add-ideas.translator-tools", - "version": "0.1.2", - "artifact": "https://git.add-ideas.de/lotobo/translator-tools/releases/download/v0.1.2/translator-tools-0.1.2.zip", - "sha256": "2ff24f97e0c3893c4d31dc347bd760d91a0d4a565fb392ec1a1b22ba9835c34f", + "version": "0.1.3", + "artifact": "https://git.add-ideas.de/lotobo/translator-tools/releases/download/v0.1.3/translator-tools-0.1.3.zip", + "sha256": "75482910c8a58e9169845bf4a3699a0385bc5ccff95259eef60004bae6814e22", "target": "translator" }, { diff --git a/scripts/release.sh b/scripts/release.sh index 6a3a091..4fad575 100644 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -199,6 +199,13 @@ if [ ! -s "$CHECKSUM_FILE" ]; then else sha256sum "$ZIP_FILE" > "$CHECKSUM_FILE" fi +else + if [ "$DRY_RUN" -eq 1 ]; then + echo "DRY-RUN: would refresh ${CHECKSUM_FILE}" + else + # ensure checksum always matches the current archive state + sha256sum "$ZIP_FILE" > "$CHECKSUM_FILE" + fi fi if [ "$SKIP_TAG" -eq 0 ]; then diff --git a/scripts/update-release-lock.mjs b/scripts/update-release-lock.mjs index 8d74322..74b9532 100644 --- a/scripts/update-release-lock.mjs +++ b/scripts/update-release-lock.mjs @@ -227,12 +227,10 @@ ${usage()}`); if (options.forceAssemble) assembleArgs.push('--force'); await runCommand('npm', assembleArgs); console.log(`Assembled release -> ${archive}`); - const releaseChecksum = path.join( - path.dirname(archive), - `${path.basename(archive)}.sha256` - ); - const releaseSha256 = await sha256ForPath(releaseChecksum === undefined ? '' : releaseChecksum); - console.log(`Release checksum: ${releaseSha256}`); + const releaseChecksum = `${archive}.sha256`; + const releaseSha256 = await sha256ForPath(archive); + await writeFile(releaseChecksum, `${releaseSha256} ${path.basename(archive)}\n`, 'utf8'); + console.log(`Assembled release checksum: ${releaseSha256}`); } run().catch((error) => {