[kde-linux/kde-linux-packages/buildstream] /: build: revisit buildstream publishing

Git commit 6833b8f243655a2d395db810747736fb6731e3a3 by Harald Sitter.
Committed on 02/08/2026 at 04:05.
Pushed by sitter into branch 'buildstream'.

build: revisit buildstream publishing

since we currently can't publish to the main bucket let's publish to the
ci-artifacts again, but mark the upload as being buildstream so we can
find it again

M  +12   -6    build.sh

https://invent.kde.org/kde-linux/kde-linux-packages/-/commit/6833b8f243655a2d395db810747736fb6731e3a3

diff --git a/build.sh b/build.sh
index 8006472..f5b1d27 100755
--- a/build.sh
+++ b/build.sh
@@ -96,16 +96,22 @@ tar --directory=tree/install --create \
 
 if [ ! -f /.dockerenv ]; then
     S3_REMOTE="storage.kde.org/kde-linux-packages/$PUBLISH_DIR/"
+    if [[ "${CI_COMMIT_BRANCH:-}" == "buildstream" ]]; then
+        # Slight hack until https://phabricator.kde.org/T18778 is resolved (giving buildstream access to the packages bucket)
+        # Mark our upload dir so we can find it again in the ci-artifacts.
+        touch upload/this-is-buildstream
+        S3_REMOTE="storage.kde.org/ci-artifacts/$CI_PROJECT_PATH/j/$CI_JOB_ID/$PUBLISH_DIR/"
+    fi
     if [[ "${CI_COMMIT_BRANCH:-}" == work/* ]]; then
         S3_REMOTE="storage.kde.org/ci-artifacts/$CI_PROJECT_PATH/j/$CI_JOB_ID/$PUBLISH_DIR/"
+    else
+        # Claim the publish lock
+        curl https://resources.kde-linux.haraldsitter.eu/v1/locks
+        git clone https://invent.kde.org/sitter/kde-linux-resource-semaphore
+        kde-linux-resource-semaphore/resource-holder --resource packages-storage-$PUBLISH_DIR &
+        PUBLISH_RESOURCE_HOLDER_PID=$!
     fi
 
-    # Claim the publish lock
-    curl https://resources.kde-linux.haraldsitter.eu/v1/locks
-    git clone https://invent.kde.org/sitter/kde-linux-resource-semaphore
-    kde-linux-resource-semaphore/resource-holder --resource packages-storage-$PUBLISH_DIR &
-    PUBLISH_RESOURCE_HOLDER_PID=$!
-
     # Keep the images pipeline on the same KDE Linux package mirror version.
     cp "$CI_PROJECT_DIR/artifacts/build_repo.txt" upload/repo/build_repo.txt