From 69f39890ff3ce81ea1286a9403c99b05cee791ee Mon Sep 17 00:00:00 2001 From: Nick Porter Date: Fri, 3 May 2024 11:26:37 -0600 Subject: [PATCH 1/8] Compare against last common commit --- ci_scripts/api_diff/build_xcframeworks.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ci_scripts/api_diff/build_xcframeworks.rb b/ci_scripts/api_diff/build_xcframeworks.rb index e1144b4b9e8..bffde9638be 100644 --- a/ci_scripts/api_diff/build_xcframeworks.rb +++ b/ci_scripts/api_diff/build_xcframeworks.rb @@ -6,7 +6,13 @@ def checkout_build_generate(branch, archive_name) # Checkout old or new version, build and generate API JSON puts "Building and generating public interface from #{branch}..." - system("git checkout #{branch}") + if archive_name == "master" + base_ref = ENV["GITHUB_BASE_REF"] + head_ref = ENV['GITHUB_HEAD_REF'] + system("git checkout $(git merge-base #{head_ref} #{base_ref})") + else + system("git checkout #{branch}") + end system("xcodebuild clean archive \ -quiet \ @@ -30,5 +36,5 @@ def checkout_build_generate(branch, archive_name) end # Run function for master and head_ref -checkout_build_generate("master", "master") +checkout_build_generate(ENV["GITHUB_BASE_REF"], "master") checkout_build_generate(ENV['GITHUB_HEAD_REF'], "new") \ No newline at end of file From 944107cf13cfd6f386d8ea58a868116e80bd60fb Mon Sep 17 00:00:00 2001 From: Nick Porter Date: Fri, 3 May 2024 11:37:20 -0600 Subject: [PATCH 2/8] Trigger CI check --- .../Internal/API Bindings/STPPaymentMethodListDeserializer.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/StripePayments/StripePayments/Source/Internal/API Bindings/STPPaymentMethodListDeserializer.swift b/StripePayments/StripePayments/Source/Internal/API Bindings/STPPaymentMethodListDeserializer.swift index 431782da509..79934df5d12 100644 --- a/StripePayments/StripePayments/Source/Internal/API Bindings/STPPaymentMethodListDeserializer.swift +++ b/StripePayments/StripePayments/Source/Internal/API Bindings/STPPaymentMethodListDeserializer.swift @@ -38,6 +38,7 @@ import Foundation paymentMethods.append(paymentMethod) } } + // Modify Swift file to trigger CI paymentMethodsDeserializer.paymentMethods = paymentMethods return paymentMethodsDeserializer } From 2989baa8584220e6872dee6e1b2b1ee5a291b6b0 Mon Sep 17 00:00:00 2001 From: Nick Porter Date: Fri, 3 May 2024 11:49:56 -0600 Subject: [PATCH 3/8] Small tweak --- ci_scripts/api_diff/build_xcframeworks.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci_scripts/api_diff/build_xcframeworks.rb b/ci_scripts/api_diff/build_xcframeworks.rb index bffde9638be..574e9036be8 100644 --- a/ci_scripts/api_diff/build_xcframeworks.rb +++ b/ci_scripts/api_diff/build_xcframeworks.rb @@ -7,9 +7,8 @@ def checkout_build_generate(branch, archive_name) # Checkout old or new version, build and generate API JSON puts "Building and generating public interface from #{branch}..." if archive_name == "master" - base_ref = ENV["GITHUB_BASE_REF"] head_ref = ENV['GITHUB_HEAD_REF'] - system("git checkout $(git merge-base #{head_ref} #{base_ref})") + system("git checkout $(git merge-base #{head_ref} #{branch})") else system("git checkout #{branch}") end From 6dfd90dfbfc59efce78ff0ca7eeda07451641f13 Mon Sep 17 00:00:00 2001 From: Nick Porter Date: Fri, 3 May 2024 12:09:18 -0600 Subject: [PATCH 4/8] Swap order, add log --- ci_scripts/api_diff/build_xcframeworks.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci_scripts/api_diff/build_xcframeworks.rb b/ci_scripts/api_diff/build_xcframeworks.rb index 574e9036be8..c48df4c1497 100644 --- a/ci_scripts/api_diff/build_xcframeworks.rb +++ b/ci_scripts/api_diff/build_xcframeworks.rb @@ -8,7 +8,8 @@ def checkout_build_generate(branch, archive_name) puts "Building and generating public interface from #{branch}..." if archive_name == "master" head_ref = ENV['GITHUB_HEAD_REF'] - system("git checkout $(git merge-base #{head_ref} #{branch})") + puts "git checkout $(git merge-base #{branch}) #{head_ref}" + system("git checkout $(git merge-base #{branch}) #{head_ref}") else system("git checkout #{branch}") end From 708cb33245fb32a3030f9e63626dee61f0f7a858 Mon Sep 17 00:00:00 2001 From: Nick Porter Date: Fri, 3 May 2024 12:30:16 -0600 Subject: [PATCH 5/8] Remove log --- ci_scripts/api_diff/build_xcframeworks.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci_scripts/api_diff/build_xcframeworks.rb b/ci_scripts/api_diff/build_xcframeworks.rb index c48df4c1497..8cee0ca8ee4 100644 --- a/ci_scripts/api_diff/build_xcframeworks.rb +++ b/ci_scripts/api_diff/build_xcframeworks.rb @@ -8,8 +8,8 @@ def checkout_build_generate(branch, archive_name) puts "Building and generating public interface from #{branch}..." if archive_name == "master" head_ref = ENV['GITHUB_HEAD_REF'] - puts "git checkout $(git merge-base #{branch}) #{head_ref}" - system("git checkout $(git merge-base #{branch}) #{head_ref}") + commit_sha = system("git merge-base #{branch} #{head_ref}") + system("git checkout #{commit_sha}") else system("git checkout #{branch}") end From de1c5c4992dba20838968af3c00bed64e4a49baf Mon Sep 17 00:00:00 2001 From: Nick Porter Date: Mon, 6 May 2024 09:15:52 -0600 Subject: [PATCH 6/8] Use v3 checkout --- .github/workflows/verify-public-interface.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-public-interface.yml b/.github/workflows/verify-public-interface.yml index b4f607957ff..cd776690099 100644 --- a/.github/workflows/verify-public-interface.yml +++ b/.github/workflows/verify-public-interface.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 From f826fca02a6e6290b5c784f7cc63836afff3786c Mon Sep 17 00:00:00 2001 From: Nick Porter Date: Mon, 6 May 2024 09:35:18 -0600 Subject: [PATCH 7/8] Use new GH uses --- .github/workflows/verify-public-interface.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/verify-public-interface.yml b/.github/workflows/verify-public-interface.yml index cd776690099..21480f57f50 100644 --- a/.github/workflows/verify-public-interface.yml +++ b/.github/workflows/verify-public-interface.yml @@ -16,9 +16,14 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: fetch-depth: 0 + + - name: Checkout through merge base + uses: rmacklin/fetch-through-merge-base@v0 + with: + ref: ${{ github.head_ref }} - name: Build frameworks and compare interfaces id: build-frameworks-compare-interface From 3d199cd6bc92c114291f6742e04ca8d02e9fe033 Mon Sep 17 00:00:00 2001 From: Nick Porter Date: Mon, 6 May 2024 09:53:14 -0600 Subject: [PATCH 8/8] Update verify-public-interface.yml --- .github/workflows/verify-public-interface.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/verify-public-interface.yml b/.github/workflows/verify-public-interface.yml index 21480f57f50..0af0626a3db 100644 --- a/.github/workflows/verify-public-interface.yml +++ b/.github/workflows/verify-public-interface.yml @@ -23,8 +23,10 @@ jobs: - name: Checkout through merge base uses: rmacklin/fetch-through-merge-base@v0 with: - ref: ${{ github.head_ref }} - + base_ref: ${{ github.event.pull_request.base.ref }} + head_ref: ${{ github.event.pull_request.head.sha }} + deepen_length: 500 + - name: Build frameworks and compare interfaces id: build-frameworks-compare-interface run: |