change support stable

diff --git a/builder/build-in-container b/builder/build-in-container
index c51ef9942a85d8e5ee5370aeb714fd17c836145c..d293c9ff0b12c72132a25fc29cf032d741a98463 100755 (executable)
--- a/builder/build-in-container
+++ b/builder/build-in-container
@@ -32,7 +32,7 @@ run_builder_container()
 
 main()
 {
-       local distros="debian:bookworm debian:trixie debian:forky ubuntu:noble"
+       local distros="debian:oldstable debian:stable debian:testing ubuntu:latest"
        mkdir -p build
        cp builder/run build/
 

diff --git a/builder/run b/builder/run
index c89ade527270280a3114fb4f13ae6512012e089c..fddf2c8db9c88bdb53ca80760115d07f0e00e88a 100644 (file)
--- a/builder/run
+++ b/builder/run
@@ -50,7 +50,7 @@ build_package()
        cd /app-build \
                || errlog "could not change directory to /app-build" \
                || return $?
-       cmake -DEXTRA_VERSION="-$EXTRA_VERSION" \
+       cmake -DEXTRA_VERSION="-$ID-$VERSION_CODENAME" \
                -DCMAKE_BUILD_TYPE=Release /source \
                || errlog "could not create build with cmake" \
                || return $?
@@ -65,7 +65,7 @@ build_package()
        cd /app-imagemagick-build \
                || errlog "could not change directory to /app-imagemagick-build " \
                || return $?
-       cmake -DEXTRA_VERSION="-imagemagick-$EXTRA_VERSION" \
+       cmake -DEXTRA_VERSION="-imagemagick-$ID-$VERSION_CODENAME" \
                -DCMAKE_BUILD_TYPE=Release -DIMAGEMAGICK=ON /source \
                || errlog "could not create build with cmake" \
                || return $?
@@ -79,10 +79,10 @@ copy_package()
 {
        echo "ℹ️ INFO: copy package"
        cp /app-build/*.deb /source/build/ \
-               || errlog "could not copy package to /source/build-$EXTRA_VERSION" \
+               || errlog "could not copy package to /source/build-$ID-$VERSION_CODENAME" \
                || return $?
        cp /app-imagemagick-build/*.deb /source/build/ \
-               || errlog "could not copy package to /source/build-$EXTRA_VERSION" \
+               || errlog "could not copy package to /source/build-$ID-$VERSION_CODENAME" \
                || return $?
 }
 
@@ -90,6 +90,7 @@ main()
 {
        echo "⭐ START: run"
 
+       source /etc/os-release
        run_tests || return $?
        build_package || return $?
        copy_package || return $?