From fb3ab79fb77823212179a3090751f7ff9deecf8c Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Wed, 25 Sep 2024 20:17:34 -0700 Subject: [PATCH 1/2] Stop forcing Xcode versions and cocoapods updates. The base images are advanced enough that these don't need to be controlled any more. --- .github/workflows/cocoapods.yml | 9 --------- .github/workflows/examples.yml | 3 --- .github/workflows/service_generator.yml | 3 --- .github/workflows/swiftpm.yml | 6 ------ 4 files changed, 21 deletions(-) diff --git a/.github/workflows/cocoapods.yml b/.github/workflows/cocoapods.yml index c718ab7f7..6bb48b897 100644 --- a/.github/workflows/cocoapods.yml +++ b/.github/workflows/cocoapods.yml @@ -31,13 +31,7 @@ jobs: pod_configuration: ["Debug", "Release"] extra_flags: ["", "--use-static-frameworks"] steps: - # The "macos-14" image defaults to 15.0.1, select the newer Xcode. - - name: Xcode version - run: sudo xcode-select -switch /Applications/Xcode_15.2.app - uses: actions/checkout@v4 - # The "macos-14" image has CocoaPods 1.14.x, and 1.15 is needed for visionOS - - name: Update CocoaPods - run: gem install cocoapods - name: "iOS, macOS, tvOS, and visionOS" run: | pod lib lint --verbose ${{ matrix.extra_flags }} \ @@ -67,9 +61,6 @@ jobs: matrix: pod_configuration: ["Debug", "Release"] steps: - # The "macos-14" image defaults to 15.0.1, select the newer Xcode. - - name: Xcode version - run: sudo xcode-select -switch /Applications/Xcode_15.2.app - uses: actions/checkout@v4 - name: "macOS" run: | diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 487e10435..6c1f1d16b 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -37,9 +37,6 @@ jobs: matrix: SAMPLE: ["Calendar", "Drive", "YouTube", "Storage"] steps: - # The "macos-14" image defaults to 15.0.1, select the newer Xcode. - - name: Xcode version - run: sudo xcode-select -switch /Applications/Xcode_15.2.app - uses: actions/checkout@v4 - name: Build Debug run: | diff --git a/.github/workflows/service_generator.yml b/.github/workflows/service_generator.yml index e242c921e..f9e5689a6 100644 --- a/.github/workflows/service_generator.yml +++ b/.github/workflows/service_generator.yml @@ -49,9 +49,6 @@ jobs: matrix: CONFIGURATION: ["Debug", "Release"] steps: - # The "macos-14" image defaults to 15.0.1, select the newer Xcode. - - name: Xcode version - run: sudo xcode-select -switch /Applications/Xcode_15.2.app - uses: actions/checkout@v4 - name: Build ServiceGenerator run: | diff --git a/.github/workflows/swiftpm.yml b/.github/workflows/swiftpm.yml index 5d29a20a3..0123818b9 100644 --- a/.github/workflows/swiftpm.yml +++ b/.github/workflows/swiftpm.yml @@ -30,9 +30,6 @@ jobs: matrix: CONFIGURATION: ["debug", "release"] steps: - # The "macos-14" image defaults to 15.0.1, select the newer Xcode. - - name: Xcode version - run: sudo xcode-select -switch /Applications/Xcode_15.2.app - uses: actions/checkout@v4 - name: Build and Test Library run: | @@ -50,9 +47,6 @@ jobs: PLATFORM: ["ios", "macos", "tvos", "watchos", "visionos"] CONFIGURATION: ["Debug", "Release"] steps: - # The "macos-14" image defaults to 15.0.1, select the newer Xcode. - - name: Xcode version - run: sudo xcode-select -switch /Applications/Xcode_15.2.app - uses: actions/checkout@v4 - name: Build and Test Library run: | From 894a2031c95c1302eafacae1b7472f434c45d470 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Thu, 26 Sep 2024 07:28:56 -0700 Subject: [PATCH 2/2] Stop testing visionOS for the time being. The GitHub runners dropped visionOS. https://github.com/actions/runner-images/issues/10559 --- .github/workflows/cocoapods.yml | 5 +++-- .github/workflows/swiftpm.yml | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cocoapods.yml b/.github/workflows/cocoapods.yml index 6bb48b897..fb28496b1 100644 --- a/.github/workflows/cocoapods.yml +++ b/.github/workflows/cocoapods.yml @@ -32,11 +32,12 @@ jobs: extra_flags: ["", "--use-static-frameworks"] steps: - uses: actions/checkout@v4 - - name: "iOS, macOS, tvOS, and visionOS" + - name: "iOS, macOS, and tvOS" + # GitHub runners dropped visionOS. https://github.com/actions/runner-images/issues/10559 run: | pod lib lint --verbose ${{ matrix.extra_flags }} \ --configuration=${{ matrix.pod_configuration }} \ - --platforms=ios,macos,tvos,visionos \ + --platforms=ios,macos,tvos \ --no-subspecs \ --test-specs=Tests \ GoogleAPIClientForREST.podspec diff --git a/.github/workflows/swiftpm.yml b/.github/workflows/swiftpm.yml index 0123818b9..04261f9f2 100644 --- a/.github/workflows/swiftpm.yml +++ b/.github/workflows/swiftpm.yml @@ -44,7 +44,8 @@ jobs: strategy: fail-fast: false matrix: - PLATFORM: ["ios", "macos", "tvos", "watchos", "visionos"] + # GitHub runners dropped visionOS. https://github.com/actions/runner-images/issues/10559 + PLATFORM: ["ios", "macos", "tvos", "watchos"] CONFIGURATION: ["Debug", "Release"] steps: - uses: actions/checkout@v4