diff --git a/.github/workflows/ci-tests-xcode-beta.yml b/.github/workflows/ci-tests-xcode-beta.yml index ebf4e338d..ca4b5f1cd 100644 --- a/.github/workflows/ci-tests-xcode-beta.yml +++ b/.github/workflows/ci-tests-xcode-beta.yml @@ -1,7 +1,8 @@ name: "CI Tests (Xcode 16.0 Beta)" on: - workflow_dispatch + pull_request: + types: [opened, synchronize, reopened] env: XCODE_VERSION: "16.0-beta" @@ -84,124 +85,111 @@ jobs: run: | cd ${{ matrix.package }} && swift build - build-and-unit-test: - runs-on: macos-latest - needs: [tuist-generation, changes] - timeout-minutes: 20 - strategy: - fail-fast: false - matrix: - include: - # macOS_current - - destination: platform=macOS,arch=x86_64 - scheme: ApolloTests - test-plan: Apollo-CITestPlan - name: Apollo Unit Tests - macOS - run-js-tests: false - should-run: ${{ needs.changes.outputs.ios }} - # Codegen CLI Test - - destination: platform=macOS,arch=x86_64 - scheme: CodegenCLITests - test-plan: CodegenCLITestPlan - name: Codegen CLI Unit Tests - macOS - run-js-tests: false - should-run: ${{ needs.changes.outputs.codegen }} - # CodegenLib Test - - destination: platform=macOS,arch=x86_64 - scheme: ApolloCodegenTests - test-plan: Apollo-Codegen-CITestPlan - name: Codegen Lib Unit Tests - macOS - run-js-tests: true - should-run: ${{ needs.changes.outputs.codegen }} - # ApolloPagination Tests - - destination: platform=macOS,arch=x86_64 - scheme: ApolloPaginationTests - test-plan: Apollo-PaginationTestPlan - name: ApolloPagination Unit Tests - macOS - run-js-tests: false - should-run: ${{ needs.changes.outputs.pagination }} - name: ${{ matrix.name }} - steps: - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: ${{ env.XCODE_VERSION }} - - name: Checkout Repo - uses: actions/checkout@v3 - - name: Retrieve Build Cache - uses: actions/cache@v3 - with: - path: | - ./ApolloDev.xcodeproj - ./ApolloDev.xcworkspace - ./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/tuist-action@0.13.0 - # with: - # command: 'generate' - # arguments: '' - - name: Build and Test - if: ${{ matrix.should-run == true || matrix.should-run == 'true' }} - id: build-and-test - uses: ./.github/actions/build-and-run-unit-tests - with: - destination: ${{ matrix.destination }} - scheme: ${{ matrix.scheme }} - test-plan: ${{ matrix.test-plan }} - - name: Run-JS-Tests - if: ${{ matrix.run-js-tests == true }} - shell: bash - working-directory: apollo-ios-codegen/Sources/GraphQLCompiler/JavaScript/ - run: | - npm install && npm test - - name: Save xcodebuild logs - if: ${{ steps.build-and-test.outcome != 'skipped' }} - uses: actions/upload-artifact@v3 - with: - name: ${{ matrix.name }}-logs - path: | - DerivedData/Logs/Build - - name: Save crash logs - if: ${{ steps.build-and-test.outcome != 'skipped' }} - uses: actions/upload-artifact@v3 - with: - name: ${{ matrix.name }}-crashes - path: | - ~/Library/Logs/DiagnosticReports - - name: Zip Result Bundle - if: ${{ steps.build-and-test.outcome != 'skipped' }} - shell: bash - working-directory: TestResults - run: | - zip -r ResultBundle.zip ResultBundle.xcresult - - name: Save test results - if: ${{ steps.build-and-test.outcome != 'skipped' }} - uses: actions/upload-artifact@v3 - with: - name: ${{ matrix.name }}-results - path: | - TestResults/ResultBundle.zip + # build-and-unit-test: + # runs-on: macos-latest + # needs: [tuist-generation, changes] + # timeout-minutes: 20 + # strategy: + # fail-fast: false + # matrix: + # include: + # # macOS_current + # - destination: platform=macOS,arch=x86_64 + # scheme: ApolloTests + # test-plan: Apollo-CITestPlan + # name: Apollo Unit Tests - macOS + # run-js-tests: false + # should-run: ${{ needs.changes.outputs.ios }} + # # Codegen CLI Test + # - destination: platform=macOS,arch=x86_64 + # scheme: CodegenCLITests + # test-plan: CodegenCLITestPlan + # name: Codegen CLI Unit Tests - macOS + # run-js-tests: false + # should-run: ${{ needs.changes.outputs.codegen }} + # # CodegenLib Test + # - destination: platform=macOS,arch=x86_64 + # scheme: ApolloCodegenTests + # test-plan: Apollo-Codegen-CITestPlan + # name: Codegen Lib Unit Tests - macOS + # run-js-tests: true + # should-run: ${{ needs.changes.outputs.codegen }} + # # ApolloPagination Tests + # - destination: platform=macOS,arch=x86_64 + # scheme: ApolloPaginationTests + # test-plan: Apollo-PaginationTestPlan + # name: ApolloPagination Unit Tests - macOS + # run-js-tests: false + # should-run: ${{ needs.changes.outputs.pagination }} + # name: ${{ matrix.name }} + # steps: + # - uses: maxim-lobanov/setup-xcode@v1 + # with: + # xcode-version: ${{ env.XCODE_VERSION }} + # - name: Checkout Repo + # uses: actions/checkout@v3 + # - name: Retrieve Build Cache + # uses: actions/cache@v3 + # with: + # path: | + # ./ApolloDev.xcodeproj + # ./ApolloDev.xcworkspace + # ./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/tuist-action@0.13.0 + # # with: + # # command: 'generate' + # # arguments: '' + # - name: Build and Test + # if: ${{ matrix.should-run == true || matrix.should-run == 'true' }} + # id: build-and-test + # uses: ./.github/actions/build-and-run-unit-tests + # with: + # destination: ${{ matrix.destination }} + # scheme: ${{ matrix.scheme }} + # test-plan: ${{ matrix.test-plan }} + # - name: Run-JS-Tests + # if: ${{ matrix.run-js-tests == true }} + # shell: bash + # working-directory: apollo-ios-codegen/Sources/GraphQLCompiler/JavaScript/ + # run: | + # npm install && npm test + # - name: Save xcodebuild logs + # if: ${{ steps.build-and-test.outcome != 'skipped' }} + # uses: actions/upload-artifact@v3 + # with: + # name: ${{ matrix.name }}-logs + # path: | + # DerivedData/Logs/Build + # - name: Save crash logs + # if: ${{ steps.build-and-test.outcome != 'skipped' }} + # uses: actions/upload-artifact@v3 + # with: + # name: ${{ matrix.name }}-crashes + # path: | + # ~/Library/Logs/DiagnosticReports + # - name: Zip Result Bundle + # if: ${{ steps.build-and-test.outcome != 'skipped' }} + # shell: bash + # working-directory: TestResults + # run: | + # zip -r ResultBundle.zip ResultBundle.xcresult + # - name: Save test results + # if: ${{ steps.build-and-test.outcome != 'skipped' }} + # uses: actions/upload-artifact@v3 + # with: + # name: ${{ matrix.name }}-results + # path: | + # TestResults/ResultBundle.zip - run-codegen-test-configurations: - runs-on: macos-latest - timeout-minutes: 20 - name: Codegen Test Configurations - macOS - steps: - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: ${{ env.XCODE_VERSION }} - - name: Checkout Repo - uses: actions/checkout@v3 - - name: Test Codegen Configurations - shell: bash - run: | - ./scripts/run-test-codegen-configurations.sh -t + # CodegenTestConfigurations removed because source is not compatible with Sendable yet. verify-frontend-bundle-latest: runs-on: macos-latest @@ -259,76 +247,4 @@ jobs: id: run-cocoapods-integration-tests uses: ./.github/actions/run-cocoapods-integration-tests - run-integration-tests: - runs-on: macos-13 - needs: [tuist-generation, changes] - if: ${{ needs.changes.outputs.ios == 'true' }} - timeout-minutes: 20 - name: Apollo Integration Tests - macOS - steps: - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: 15.2 - - name: Checkout Repo - uses: actions/checkout@v3 - - name: Setup Node 12.22.10 - uses: actions/setup-node@v3 - with: - node-version: 12.22.10 - - name: Setup Upload Server - shell: bash - run: | - sudo chmod -R +rwx SimpleUploadServer - cd SimpleUploadServer && npm install && npm start & - - name: Setup Node 18.15.0 - uses: actions/setup-node@v3 - with: - node-version: 18.15.0 - - name: Setup Subscription Server - shell: bash - run: | - sh ./scripts/install-apollo-server-docs-example-server.sh - cd ../docs-examples/apollo-server/v3/subscriptions-graphql-ws && npm start & - - name: Setup Star Wars Server - shell: bash - run: | - sh ./scripts/install-or-update-starwars-server.sh - cd ../starwars-server && npm start & - - name: Retrieve Build Cache - uses: actions/cache@v3 - with: - path: | - ./ApolloDev.xcodeproj - ./ApolloDev.xcworkspace - ./Derived/* - key: ${{ github.run_id }}-dependencies - fail-on-cache-miss: true - - name: Build and Test - uses: ./.github/actions/build-and-run-unit-tests - with: - destination: platform=macOS,arch=x86_64 - scheme: ApolloServerIntegrationTests - test-plan: Apollo-IntegrationTestPlan - - name: Save xcodebuild logs - uses: actions/upload-artifact@v3 - with: - name: macOS-Integration-logs - path: | - DerivedData/Logs/Build - - name: Save crash logs - uses: actions/upload-artifact@v3 - with: - name: macOS-Integration-crashes - path: | - ~/Library/Logs/DiagnosticReports - - name: Zip Result Bundle - shell: bash - working-directory: TestResults - run: | - zip -r ResultBundle.zip ResultBundle.xcresult - - name: Save test results - uses: actions/upload-artifact@v3 - with: - name: macOS-Integration-results - path: | - TestResults/ResultBundle.zip + # IntegrationTests removed because source is not compatible with Sendable yet. diff --git a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_LocalCacheMutation_Tests.swift b/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_LocalCacheMutation_Tests.swift index 3cb0753e1..1a1430a81 100644 --- a/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_LocalCacheMutation_Tests.swift +++ b/Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplate_LocalCacheMutation_Tests.swift @@ -336,8 +336,6 @@ class SelectionSetTemplate_LocalCacheMutationTests: XCTestCase { public var animalDetails: AnimalDetails { get { _toFragment() } _modify { var f = animalDetails; yield &f; __data = f.__data } - @available(*, unavailable, message: "mutate properties of the fragment instead.") - set { preconditionFailure() } } """ @@ -381,8 +379,6 @@ class SelectionSetTemplate_LocalCacheMutationTests: XCTestCase { public var animalDetails: AnimalDetails? { get { _toFragment() } _modify { var f = animalDetails; yield &f; if let newData = f?.__data { __data = newData } } - @available(*, unavailable, message: "mutate properties of the fragment instead.") - set { preconditionFailure() } } """ diff --git a/Tests/ApolloCodegenTests/TestHelpers/IRMatchers.swift b/Tests/ApolloCodegenTests/TestHelpers/IRMatchers.swift index cf671b028..e834b2063 100644 --- a/Tests/ApolloCodegenTests/TestHelpers/IRMatchers.swift +++ b/Tests/ApolloCodegenTests/TestHelpers/IRMatchers.swift @@ -587,7 +587,7 @@ extension Nimble.Matcher { func mappingActualTo( _ actualMapper: @escaping ((U?) throws -> T?) ) -> Nimble.Matcher { - Nimble.Matcher.define { (actual: Expression) in + Nimble.Matcher.define { (actual: Nimble.Expression) in let newActual = actual.cast(actualMapper) return try self.satisfies(newActual) } diff --git a/Tests/ApolloInternalTestHelpers/XCTestCase+Helpers.swift b/Tests/ApolloInternalTestHelpers/XCTestCase+Helpers.swift index 5355f13e3..bd4d7b2fe 100644 --- a/Tests/ApolloInternalTestHelpers/XCTestCase+Helpers.swift +++ b/Tests/ApolloInternalTestHelpers/XCTestCase+Helpers.swift @@ -64,7 +64,7 @@ extension StoreLoading where Self: XCTestCase { operation: Operation, file: StaticString = #filePath, line: UInt = #line, - resultHandler: @escaping AsyncResultObserver, Error>.ResultHandler + resultHandler: @escaping AsyncResultObserver, any Error>.ResultHandler ) { let resultObserver = makeResultObserver(for: operation, file: file, line: line) diff --git a/Tests/ApolloTests/Cache/ReadWriteFromStoreTests.swift b/Tests/ApolloTests/Cache/ReadWriteFromStoreTests.swift index 87325d8d4..413884347 100644 --- a/Tests/ApolloTests/Cache/ReadWriteFromStoreTests.swift +++ b/Tests/ApolloTests/Cache/ReadWriteFromStoreTests.swift @@ -1051,8 +1051,6 @@ class ReadWriteFromStoreTests: XCTestCase, CacheDependentTesting, StoreLoading { var givenFragment: GivenFragment { get { _toFragment() } _modify { var f = givenFragment; yield &f; __data = f.__data } - @available(*, unavailable, message: "mutate properties of the fragment instead.") - set { preconditionFailure() } } } } @@ -1204,8 +1202,6 @@ class ReadWriteFromStoreTests: XCTestCase, CacheDependentTesting, StoreLoading { var givenFragment: GivenFragment? { get { _toFragment() } _modify { var f = givenFragment; yield &f; if let newData = f?.__data { __data = newData } } - @available(*, unavailable, message: "mutate properties of the fragment instead.") - set { preconditionFailure() } } } } diff --git a/Tests/CodegenCLITests/Matchers/ErrorMatchers.swift b/Tests/CodegenCLITests/Matchers/ErrorMatchers.swift index 808ab6e4a..fc771020f 100644 --- a/Tests/CodegenCLITests/Matchers/ErrorMatchers.swift +++ b/Tests/CodegenCLITests/Matchers/ErrorMatchers.swift @@ -4,7 +4,7 @@ import Nimble public func throwUserValidationError( _ expectedError: ValidationError -) -> Nimble.Matcher { +) -> Nimble.Matcher { return Matcher { actualExpression in var actualError: (any Error)? do { @@ -41,7 +41,7 @@ public func throwUserValidationError( } } -public func throwUnknownOptionError() -> Nimble.Matcher { +public func throwUnknownOptionError() -> Nimble.Matcher { return Matcher { actualExpression in var actualError: (any Error)? do { diff --git a/apollo-ios-codegen/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift b/apollo-ios-codegen/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift index 686c22a0f..85b5f1174 100644 --- a/apollo-ios-codegen/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift +++ b/apollo-ios-codegen/Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift @@ -559,8 +559,6 @@ struct SelectionSetTemplate { "if let newData = f?.__data { __data = newData }", else: "__data = f.__data" ) } - @available(*, unavailable, message: "mutate properties of the fragment instead.") - set { preconditionFailure() } } """, else: " _toFragment() }" diff --git a/apollo-ios/Sources/ApolloAPI/LocalCacheMutation.swift b/apollo-ios/Sources/ApolloAPI/LocalCacheMutation.swift index f09fed6c8..91dccd631 100644 --- a/apollo-ios/Sources/ApolloAPI/LocalCacheMutation.swift +++ b/apollo-ios/Sources/ApolloAPI/LocalCacheMutation.swift @@ -39,8 +39,6 @@ public extension MutableSelectionSet where Fragments: FragmentContainer { yield &f self.__data._data = f.__data._data } - @available(*, unavailable, message: "mutate properties of the fragment instead.") - set { preconditionFailure("") } } }