resolve merge leftovers

Author: armcknight

.github/workflows/benchmarking.yml

@@ -149,7 +149,7 @@ jobs:
                 env: process.env,
                 stdio: 'inherit'
               });
-              
+
               console.log("Test exists but failed, not retrying.");
               core.setFailed('Test exists but failed');
             } catch (error) {

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
             -scheme Sentry \
             -configuration Release \
             -destination platform="iOS Simulator,OS=latest,name=iPhone 14 Pro" \
-            build 2>&1 | 
+            build 2>&1 |
             tee raw-analyze-output.log |
             xcbeautify
 

.github/workflows/format-code.yml

@@ -21,11 +21,9 @@ jobs:
         run: make init-ci-format
 
       - run: swiftlint --version
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-      - run: corepack enable
-      - run: yarn install
+      - run: |
+          curl -fsSL https://dprint.dev/install.sh | sh -s 0.50.0 > /dev/null 2>&1
+          ~/.dprint/bin/dprint fmt "**/*.{md,json,yaml,yml}"
 
       - name: Format Code
         run: make format

.github/workflows/lint-shellcheck.yml

@@ -9,12 +9,12 @@ on:
       - main
     paths:
       - ".github/workflows/lint-shellcheck.yml"
-      - "*.sh"
+      - "**/*.sh"
 
   pull_request:
     paths:
       - ".github/workflows/lint-shellcheck.yml"
-      - "*.sh"
+      - "**/*.sh"
 
 jobs:
   shellcheck:

.github/workflows/version-bump-util.yml

@@ -16,21 +16,66 @@ on:
       - "./Sources/Sentry/SentryMeta.m"
       - "./Tests/HybridSDKTest/HybridPod.podspec"
       - "./Sources/Configuration/SDK.xcconfig"
-      - "./Sources/Configuration/Versioning.xcconfig" 
+      - "./Sources/Configuration/Versioning.xcconfig"
       - "./Sources/Configuration/SentrySwiftUI.xcconfig"
       - "./Samples/Shared/Config/Versioning.xcconfig"
+      - "./scripts/bump.sh"
 
 jobs:
   run-version-bump:
-    name: Run Version Bump
+    # The release workflow uses the Makefile to bump the version so it needs to be tested.
+    name: Run Version Bump (Makefile)
     # We intentionally run this on ubuntu because the release workflow also runs on ubuntu, which uses the version bump util.
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Generate Version Number
+        id: generate-version-number
         run: |
           TIMESTAMP=$(date +%Y%m%d%H%M%S)
-          echo "VERSION=100.0.$TIMESTAMP" >> $GITHUB_ENV
+          echo "VERSION=100.0.$TIMESTAMP" >> $GITHUB_OUTPUT
       # We don't care which version we bump to, as long as it's a valid semver
-      - run: make bump-version TO=${{ env.VERSION }}
-      - run: make verify-version TO=${{ env.VERSION }}
+      - run: make bump-version TO=${{ steps.generate-version-number.outputs.VERSION }}
+      - run: make verify-version TO=${{ steps.generate-version-number.outputs.VERSION }}
+
+  run-version-bump-script:
+    # Craft uses the shell script to bump the version so it needs to be tested.
+    name: Run Version Bump (Shell Script)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Generate Version Number
+        id: generate-version-number
+        run: |
+          OLD_VERSION=$(cat ./Sources/Configuration/Versioning.xcconfig | grep MARKETING_VERSION | cut -d '=' -f 2 | tr -d ' ')
+          echo "Read old version: ${OLD_VERSION}"
+          echo "OLD_VERSION=${OLD_VERSION}" >> $GITHUB_OUTPUT
+
+          NEW_VERSION="100.0.$(date +%Y%m%d%H%M%S)"
+          echo "Generated new version: ${NEW_VERSION}"
+          echo "NEW_VERSION=${NEW_VERSION}" >> $GITHUB_OUTPUT
+
+      - name: Verify OLD_VERSION is defined
+        if: ${{ steps.generate-version-number.outputs.OLD_VERSION == '' }}
+        run: |
+          echo "OLD_VERSION is not defined. Make sure this script is reading the version from the correct file."
+          exit 1
+
+      - name: Create fake xcframework for update-package-sha.sh
+        run: |
+          mkdir -p Carthage
+          echo "<FAKE STATIC ZIP>" > Carthage/Sentry.xcframework.zip
+          echo "<FAKE DYNAMIC ZIP>" > Carthage/Sentry-Dynamic.xcframework.zip
+
+      - name: Bump version
+        run: ./scripts/bump.sh ${{ steps.generate-version-number.outputs.OLD_VERSION }} ${{ steps.generate-version-number.outputs.NEW_VERSION }}
+
+      - name: Verify outputs of bump.sh
+        run: make verify-version TO=${{ steps.generate-version-number.outputs.NEW_VERSION }}
+
+      - name: Verify outputs of update-package-sha.sh
+        run: |
+          ./scripts/verify-package-sha.sh \
+            --static-checksum "7062a80f8a80f8b6d812698af87384751567a6aaa0df6f03b0596d728b22dcfd" \
+            --dynamic-checksum "f6325cd8f05523d60222451fa61b3cd3d58148e5a21236f82abfd3f92750c87c" \
+            --last-release-runid "${{ github.run_id }}"