CI: rename artifacts for PRs

Author: zeha

.github/workflows/test-build.yml

@@ -63,12 +63,13 @@ jobs:
           HOST_RELEASE: ${{matrix.host_release}}
           EXTRA_CLASSES: ${{matrix.extra_classes}}
           ARCH: ${{matrix.arch}}
+          GITHUB_PR_NUMBER: ${{github.event.pull_request.number}}
 
       - name: Archive built ISO
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: grml-live-build-result-initial-${{matrix.host_release}}-${{matrix.arch}}${{matrix.extra_classes && format('-{0}', matrix.extra_classes) || ''}}
+          name: grml-live-build-result-initial-${{github.event.pull_request.number && format('pr{0}-', github.event.pull_request.number) || ''}}${{matrix.host_release}}-${{matrix.arch}}${{matrix.extra_classes && format('-{0}', matrix.extra_classes) || ''}}
           if-no-files-found: error
           retention-days: 15
           path: |
@@ -80,12 +81,13 @@ jobs:
           HOST_RELEASE: ${{matrix.host_release}}
           EXTRA_CLASSES: ${{matrix.extra_classes}}
           ARCH: ${{matrix.arch}}
+          GITHUB_PR_NUMBER: ${{github.event.pull_request.number}}
 
       - name: Archive repacked ISO
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: grml-live-build-result-repack-${{matrix.host_release}}-${{matrix.arch}}${{matrix.extra_classes && format('-{0}', matrix.extra_classes) || ''}}
+          name: grml-live-build-result-repack-${{github.event.pull_request.number && format('pr{0}-', github.event.pull_request.number) || ''}}${{matrix.host_release}}-${{matrix.arch}}${{matrix.extra_classes && format('-{0}', matrix.extra_classes) || ''}}
           if-no-files-found: error
           retention-days: 15
           path: |

build-driver/build.py

@@ -435,9 +435,15 @@ def main(program_name: str, argv: list[str]) -> int:
     elif build_mode == "daily":
         old_iso_url = None
         CI_PIPELINE_IID = os.getenv("CI_PIPELINE_IID", "0")
+        GITHUB_PR_NUMBER = os.getenv("GITHUB_PR_NUMBER", "")
         date_stamp = job_timestamp.strftime("%Y%m%d")
-        build_version = f"d{date_stamp}b{CI_PIPELINE_IID}"
-        build_release_name = f"daily{date_stamp}build{CI_PIPELINE_IID}{debian_suite}"
+        if GITHUB_PR_NUMBER:
+            short_date = job_timestamp.strftime("%y%m%d")
+            build_version = f"pr{GITHUB_PR_NUMBER}d{short_date}"
+            build_release_name = build_version
+        else:
+            build_version = f"d{date_stamp}b{CI_PIPELINE_IID}"
+            build_release_name = f"daily{date_stamp}build{CI_PIPELINE_IID}{debian_suite}"
         artifact_basename = f"grml-{flavor}-{build_release_name}-{arch}"
         job_properties = JobProperties(
             job_timestamp=job_timestamp,

test/gha-build-iso.sh

@@ -26,7 +26,7 @@ run_build() {
     local results_directory
     results_directory=$3
 
-    docker run -i --rm --volume "${PWD}:/source" -e SKIP_SOURCES=1 -e DO_DAILY_UPLOAD=0 -e EXTRA_CLASSES="${EXTRA_CLASSES:-}" -w /source debian:"$HOST_RELEASE" \
+    docker run -i --rm --volume "${PWD}:/source" -e SKIP_SOURCES=1 -e DO_DAILY_UPLOAD=0 -e EXTRA_CLASSES="${EXTRA_CLASSES:-}" -e GITHUB_PR_NUMBER="${GITHUB_PR_NUMBER:-}" -w /source debian:"$HOST_RELEASE" \
         bash -c \
         "apt-get update -qq && apt-get satisfy -q -y --no-install-recommends 'git, ca-certificates' \
         && git config --global --add safe.directory /source \