From 7be3d505a7e6fc7526ad9008e6358824aa44b5ce Mon Sep 17 00:00:00 2001 From: Trevor Elkins Date: Fri, 12 Sep 2025 18:20:02 -0400 Subject: [PATCH 1/3] test --- .github/workflows/ios_sentry_upload_pr.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ios_sentry_upload_pr.yml b/.github/workflows/ios_sentry_upload_pr.yml index 46c50e5c..44f61aa6 100644 --- a/.github/workflows/ios_sentry_upload_pr.yml +++ b/.github/workflows/ios_sentry_upload_pr.yml @@ -32,3 +32,8 @@ jobs: BASE_REF="origin/${{ github.base_ref }}" BASE_SHA=$(git merge-base "$BASE_REF" HEAD 2>/dev/null) echo "BASE_SHA=$BASE_SHA" + + - name: Fork + shell: bash + run: | + echo "test" From 54ed90ceb228b510668c02555b02206e96d70766 Mon Sep 17 00:00:00 2001 From: Trevor Elkins Date: Fri, 12 Sep 2025 18:25:11 -0400 Subject: [PATCH 2/3] stacked --- .github/workflows/ios_sentry_upload_pr.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ios_sentry_upload_pr.yml b/.github/workflows/ios_sentry_upload_pr.yml index 44f61aa6..dd3b075b 100644 --- a/.github/workflows/ios_sentry_upload_pr.yml +++ b/.github/workflows/ios_sentry_upload_pr.yml @@ -30,7 +30,13 @@ jobs: run: | set -e -o pipefail BASE_REF="origin/${{ github.base_ref }}" - BASE_SHA=$(git merge-base "$BASE_REF" HEAD 2>/dev/null) + if [[ "${{ github.base_ref }}" == "$DEFAULT" ]]; then + # Normal PR + BASE_SHA="$(git merge-base "$BASE_REF" HEAD 2>/dev/null || git merge-base HEAD "$BASE_REF")" + else + # Stacked PR + BASE_SHA="$(git rev-parse "$BASE_REF")" + fi echo "BASE_SHA=$BASE_SHA" - name: Fork From 1799461ef2fc013c74c4c9f6def1717027eee090 Mon Sep 17 00:00:00 2001 From: Trevor Elkins Date: Fri, 12 Sep 2025 18:27:33 -0400 Subject: [PATCH 3/3] oops --- .github/workflows/ios_sentry_upload_pr.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ios_sentry_upload_pr.yml b/.github/workflows/ios_sentry_upload_pr.yml index dd3b075b..845a75af 100644 --- a/.github/workflows/ios_sentry_upload_pr.yml +++ b/.github/workflows/ios_sentry_upload_pr.yml @@ -2,7 +2,6 @@ name: Sentry PR iOS Upload (Size Analysis) on: pull_request: - branches: [main] paths: [ios/**, .github/workflows/ios_sentry_upload_pr.yml] jobs: