From 8164041669d0de180199e7a07148d6a787b0dba1 Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya <byk@sentry.io>
Date: Mon, 9 Feb 2026 12:40:31 +0000
Subject: [PATCH] chore(ci): remove merge-artifacts job with Craft 2.21.1

Upgrade to Craft 2.21.1 which supports workflow-specific artifact filtering,
eliminating the need to merge all CI artifacts into a single SHA-named artifact.

Changes:
- Bump minVersion to 2.21.1
- Replace requireNames with artifactProvider.config.artifacts
- Remove merge-artifacts job from CI workflow
- Update ci-status job dependencies
---
 .craft.yml               | 13 +++++++++----
 .github/workflows/ci.yml | 24 +++++-------------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/.craft.yml b/.craft.yml
index f5c48b5e..4b94175f 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -1,13 +1,18 @@
-minVersion: '2.19.0'
+minVersion: '2.21.1'
 changelog:
   policy: auto
 versioning:
   policy: auto
 preReleaseCommand: node --experimental-strip-types script/bump-version.ts --pre
 postReleaseCommand: node --experimental-strip-types script/bump-version.ts --post
-requireNames:
-  - /^sentry-.+$/
-  - /^sentry-.*\.tgz$/
+artifactProvider:
+  name: github
+  config:
+    artifacts:
+      ci.yml:
+        - 'sentry-*'
+        - 'npm-package'
+        - 'gh-pages'
 targets:
   - name: npm
   - name: github
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b5863ed4..bfc2cf04 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -286,31 +286,17 @@ jobs:
           name: gh-pages
           path: gh-pages.zip
 
-  merge-artifacts:
-    name: Merge Artifacts
-    needs: [build-binary, build-npm, build-docs, test-e2e]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/download-artifact@v4
-      - uses: actions/upload-artifact@v4
-        with:
-          name: ${{ github.sha }}
-          path: |
-            sentry-*/
-            npm-package/*.tgz
-            gh-pages/gh-pages.zip
-
   ci-status:
     name: CI Status
     if: always()
-    needs: [changes, check-skill, merge-artifacts]
+    needs: [changes, check-skill, build-binary, build-npm, build-docs, test-e2e]
     runs-on: ubuntu-latest
     permissions: {}
     steps:
       - name: Check CI status
         run: |
-          # Check for explicit failures or cancellations
-          results="${{ needs.check-skill.result }} ${{ needs.merge-artifacts.result }}"
+          # Check for explicit failures or cancellations in all jobs
+          results="${{ needs.check-skill.result }} ${{ needs.build-binary.result }} ${{ needs.build-npm.result }} ${{ needs.build-docs.result }} ${{ needs.test-e2e.result }}"
           for result in $results; do
             if [[ "$result" == "failure" || "$result" == "cancelled" ]]; then
               echo "::error::CI failed"
@@ -320,8 +306,8 @@ jobs:
 
           # Detect upstream failures: if changes were detected but jobs were skipped,
           # it means an upstream job failed (skipped jobs cascade to dependents)
-          if [[ "${{ needs.changes.outputs.code }}" == "true" && "${{ needs.merge-artifacts.result }}" == "skipped" ]]; then
-            echo "::error::CI failed - upstream job failed causing merge-artifacts to be skipped"
+          if [[ "${{ needs.changes.outputs.code }}" == "true" && "${{ needs.test-e2e.result }}" == "skipped" ]]; then
+            echo "::error::CI failed - upstream job failed causing test-e2e to be skipped"
             exit 1
           fi
           if [[ "${{ needs.changes.outputs.skill }}" == "true" && "${{ needs.check-skill.result }}" == "skipped" ]]; then