Merge 2.0 into main branch (#780)

Author: AnthonyMDev

.github/PULL_REQUEST_TEMPLATE/pull-request-template-release.md

@@ -12,5 +12,4 @@
 - [ ] Add tag of format `major.minor.patch` to GitHub.
 - [ ] Create a release on GitHub with the new tag, using the latest [`CHANGELOG.md`](https://github.com/apollographql/apollo-ios/blob/main/CHANGELOG.md) contents.
 - [ ] Attach CLI binary to the GitHub release. _Use the `make archive-cli-for-release` command which builds both Intel and ARM architectures, and creates the tar archive for you._
-- [ ] Run `pod trunk push Apollo.podspec` and `pod trunk push ApolloTestSupport.podspec` to publish to CocoaPods. _You will need write permissions for this, please contact one of the [maintainers](https://github.com/apollographql/apollo-ios/blob/main/README.md#maintainers) if you need access to do this._
 - [ ] Run "[Release New Version](https://github.com/apollographql/apollo-ios-xcframework/actions/workflows/release-new-version.yml)" workflow in `apollo-ios-xcframework`

.github/actions/run-cocoapods-integration-tests/action.yml

@@ -3,8 +3,7 @@ description: Installs and run Tuist to generate Xcode projects
 runs:
   using: "composite"
   steps:
+    - uses: jdx/mise-action@v2
     - name: Run Tuist
       shell: bash
-      run: |
-        ./scripts/install-tuist.sh
-        tuist generate
+      run: tuist generate

.github/actions/run-tuist-generation/action.yml

@@ -1,11 +1,11 @@
-name: "CI Tests (Xcode 15.4)"
+name: "CI Tests (Xcode 16.4)"
 
 on:
   pull_request:
     types: [opened, synchronize, reopened]
 
 env:
-  XCODE_VERSION: "15.4"
+  XCODE_VERSION: "16.4"
 
 jobs:
   changes:
@@ -40,7 +40,7 @@ jobs:
               - '.tuist-version'
 
   tuist-generation:
-    runs-on: macos-14
+    runs-on: macos-latest
     needs: [changes]
     if: ${{ needs.changes.outputs.ios == 'true' || needs.changes.outputs.codegen  == 'true' || needs.changes.outputs.pagination  == 'true' || needs.changes.outputs.tuist == 'true' }}
     timeout-minutes: 8
@@ -63,7 +63,7 @@ jobs:
         key: ${{ github.run_id }}-dependencies
 
   run-swift-builds:
-    runs-on: macos-14
+    runs-on: macos-latest
     timeout-minutes: 15
     strategy:
       fail-fast: false
@@ -85,7 +85,7 @@ jobs:
         cd ${{ matrix.package }} && swift build
 
   build-and-unit-test:
-    runs-on: macos-14
+    runs-on: macos-latest
     needs: [tuist-generation, changes]
     timeout-minutes: 20
     strategy:
@@ -136,16 +136,6 @@ jobs:
           ./Derived/*
         key: ${{ github.run_id }}-dependencies
         fail-on-cache-miss: true
-    # Caching for apollo-ios and apollo-ios-codegen SPM dependencies
-    # - uses: actions/cache@v3
-    #   with:
-    #     path: ./DerivedData/SourcePackages
-    #     key: ${{ runner.os }}-spm-${{ hashFiles('./apollo-ios/Package.resolved') }}-${{ hashFiles('./apollo-ios-codegen/Package.resolved') }}
-    # - name: Run Tuist Generation
-    #   uses: tuist/[email protected]
-    #   with:
-    #       command: 'generate'
-    #       arguments: ''
     - name: Build and Test
       if: ${{ matrix.should-run == true || matrix.should-run == 'true' }}
       id: build-and-test
@@ -187,9 +177,8 @@ jobs:
         name: ${{ matrix.name }}-results
         path: |
           TestResults/ResultBundle.zip
-
   run-codegen-test-configurations:
-    runs-on: macos-14
+    runs-on: macos-latest
     timeout-minutes: 20
     name: Codegen Test Configurations - macOS
     steps:
@@ -202,9 +191,9 @@ jobs:
       shell: bash
       run: |
         ./scripts/run-test-codegen-configurations.sh -t
-  
+
   verify-frontend-bundle-latest:
-    runs-on: macos-14
+    runs-on: macos-latest
     needs: [changes]
     if: ${{ needs.changes.outputs.codegen  == 'true' }}
     timeout-minutes: 5
@@ -222,7 +211,7 @@ jobs:
         git diff --exit-code
 
   verify-cli-binary-archive:
-    runs-on: macos-14
+    runs-on: macos-latest
     needs: [changes]
     if: ${{ needs.changes.outputs.codegen  == 'true' }}
     timeout-minutes: 5
@@ -238,23 +227,3 @@ jobs:
       shell: bash
       working-directory: apollo-ios/scripts
       run: ./cli-version-check.sh
-
-  run-cocoapods-integration-tests:
-    runs-on: macos-14
-    timeout-minutes: 20
-    name: Cocoapods Integration Tests - macOS
-    steps:
-    - uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: ${{ env.XCODE_VERSION }}
-    - name: Checkout Repo
-      uses: actions/checkout@v3
-    - name: Export ENV Variables
-      shell: bash
-      working-directory: apollo-ios
-      run: |
-        apollo_ios_sha=$(git rev-parse HEAD)
-        echo "APOLLO_IOS_SHA=$apollo_ios_sha" >> ${GITHUB_ENV}
-    - name: Run CocoaPods Integration Tests
-      id: run-cocoapods-integration-tests
-      uses: ./.github/actions/run-cocoapods-integration-tests

.github/workflows/ci-tests-xcode-swift-6.yml

@@ -13,10 +13,14 @@ env:
 
 jobs:
   create-release-pr:
-    runs-on: macos-latest
+    runs-on: macos-15
     timeout-minutes: 5
     name: "Create Release PR"
     steps:
+    - name: Set Xcode Version
+      uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest-stable
     - name: Checkout Repo
       uses: actions/checkout@v4
     - name: Setup SSH Keys

.github/workflows/ci-tests.yml

@@ -83,16 +83,3 @@ jobs:
           gh workflow run release-new-version.yml -f remoteRef=${{ env.RELEASE_VERSION }} --repo "apollographql/apollo-ios-xcframework"
         env:
           GH_TOKEN: ${{ secrets.APOLLO_IOS_PAT }}
-
-      # Push Pods for Apollo iOS and Test Support
-      - name: Push Cocoapods
-        shell: bash
-        env:
-          COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
-        run: |
-          export COCOAPODS_VALIDATOR_SKIP_XCODEBUILD=true:$PATH
-          gem install cocoapods
-          set -eo pipefail
-          cd apollo-ios
-          pod trunk push Apollo.podspec --allow-warnings
-          pod trunk push ApolloTestSupport.podspec --synchronous --allow-warnings