From 6cd62b7b1ed4700e2b31858b4faf182f67b8c45f Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 23 Jun 2026 16:03:51 -0700 Subject: [PATCH 1/5] Update SPM CI job to Xcode 26 --- .github/workflows/google-utilities.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/google-utilities.yml b/.github/workflows/google-utilities.yml index c0c4077..28443db 100644 --- a/.github/workflows/google-utilities.yml +++ b/.github/workflows/google-utilities.yml @@ -78,7 +78,7 @@ jobs: run: ./setup-scripts.sh - name: Initialize xcodebuild run: | - sudo xcode-select -s '/Applications/Xcode_16.2.app/Contents/Developer' + sudo xcode-select -s '/Applications/Xcode_26.4.app/Contents/Developer' xcodebuild -list - name: Install Simulator if: matrix.target == 'iOS' || matrix.target == 'tvOS' From dabc2e56a51bd4ed9101bbe1959c6c0841a7292d Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 23 Jun 2026 16:11:22 -0700 Subject: [PATCH 2/5] pinned hashes and no quotes --- .github/workflows/google-utilities.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/google-utilities.yml b/.github/workflows/google-utilities.yml index 28443db..a308ac1 100644 --- a/.github/workflows/google-utilities.yml +++ b/.github/workflows/google-utilities.yml @@ -17,7 +17,7 @@ jobs: outputs: WAS_CHANGED: ${{ steps.check_changed.outputs.WAS_CHANGED }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - id: check_changed name: Check if: ${{ github.event_name == 'schedule' }} @@ -35,7 +35,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: ruby-version: "2.7" - - uses: actions/checkout@v3 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - name: Setup Scripts Directory run: ./setup-scripts.sh - name: Setup Bundler @@ -51,10 +51,10 @@ jobs: runs-on: macOS-latest steps: - - uses: ruby/setup-ruby@v1 + - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1 with: ruby-version: "2.7" - - uses: actions/checkout@v3 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - name: Setup Scripts Directory run: ./setup-scripts.sh - name: Setup Bundler @@ -73,12 +73,12 @@ jobs: matrix: target: [iOS, tvOS, macOS, catalyst] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - name: Setup Scripts Directory run: ./setup-scripts.sh - name: Initialize xcodebuild run: | - sudo xcode-select -s '/Applications/Xcode_26.4.app/Contents/Developer' + sudo xcode-select -s /Applications/Xcode_26.4.app/Contents/Developer xcodebuild -list - name: Install Simulator if: matrix.target == 'iOS' || matrix.target == 'tvOS' @@ -97,10 +97,10 @@ jobs: '--use-libraries --skip-tests' ] steps: - - uses: ruby/setup-ruby@v1 + - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1 with: ruby-version: "2.7" - - uses: actions/checkout@v3 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - name: Setup Scripts Directory run: ./setup-scripts.sh - name: Setup Bundler From bdc9094e2568abf093b356561a1d48139a5c2610 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 23 Jun 2026 16:54:11 -0700 Subject: [PATCH 3/5] fix --- .github/workflows/google-utilities.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/google-utilities.yml b/.github/workflows/google-utilities.yml index a308ac1..868df65 100644 --- a/.github/workflows/google-utilities.yml +++ b/.github/workflows/google-utilities.yml @@ -81,7 +81,7 @@ jobs: sudo xcode-select -s /Applications/Xcode_26.4.app/Contents/Developer xcodebuild -list - name: Install Simulator - if: matrix.target == 'iOS' || matrix.target == 'tvOS' + if: matrix.target == 'iOS' run: xcodebuild -downloadPlatform ${{ matrix.target }} - name: iOS Unit Tests run: scripts/third_party/travis/retry.sh scripts/build.sh GoogleUtilities-Package ${{ matrix.target }} spm From 270ded50dfe304e27b626c238c69db775565a263 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 23 Jun 2026 16:58:59 -0700 Subject: [PATCH 4/5] runs on macos-26 --- .github/workflows/google-utilities.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/google-utilities.yml b/.github/workflows/google-utilities.yml index 868df65..d00672f 100644 --- a/.github/workflows/google-utilities.yml +++ b/.github/workflows/google-utilities.yml @@ -68,7 +68,7 @@ jobs: needs: changed_today if: ${{ github.event_name == 'pull_request' || needs.changed_today.outputs.WAS_CHANGED == 'true' }} - runs-on: macOS-latest + runs-on: macos-26 strategy: matrix: target: [iOS, tvOS, macOS, catalyst] From 405e14a1aaa9273ab97c6090178d395eb6b1e86e Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 23 Jun 2026 17:09:56 -0700 Subject: [PATCH 5/5] more pinned hashes --- .github/workflows/check.yml | 6 +++--- .github/workflows/google-utilities.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 02d3f21..0f63672 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -15,14 +15,14 @@ jobs: env: MINT_PATH: ${{ github.workspace }}/mint steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0 with: python-version: '3.10' - name: Cache Mint packages - uses: actions/cache@v4 + uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1 with: path: ${{ env.MINT_PATH }} key: ${{ runner.os }}-mint-${{ hashFiles('**/Mintfile') }} diff --git a/.github/workflows/google-utilities.yml b/.github/workflows/google-utilities.yml index d00672f..0b47799 100644 --- a/.github/workflows/google-utilities.yml +++ b/.github/workflows/google-utilities.yml @@ -32,7 +32,7 @@ jobs: matrix: target: [ios, tvos, macos] steps: - - uses: ruby/setup-ruby@v1 + - uses: ruby/setup-ruby@9eb537ca036ebaed86729dcb9309076e4c5c3b74 # v1.314 with: ruby-version: "2.7" - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 @@ -51,7 +51,7 @@ jobs: runs-on: macOS-latest steps: - - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1 + - uses: ruby/setup-ruby@9eb537ca036ebaed86729dcb9309076e4c5c3b74 # v1.314 with: ruby-version: "2.7" - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 @@ -97,7 +97,7 @@ jobs: '--use-libraries --skip-tests' ] steps: - - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1 + - uses: ruby/setup-ruby@9eb537ca036ebaed86729dcb9309076e4c5c3b74 # v1.314 with: ruby-version: "2.7" - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1