Skip to content

Commit

Permalink
Remove server integration tests (#497)
Browse files Browse the repository at this point in the history
Co-authored-by: Calvin Cestari <calvin.cestari@gmail.com>
  • Loading branch information
AnthonyMDev and calvincestari authored Sep 30, 2024
1 parent a805cc5 commit 51c414e
Show file tree
Hide file tree
Showing 24 changed files with 2 additions and 2,350 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/ci-tests-xcode-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ jobs:
filters: |
ios:
- 'apollo-ios/**'
- 'Tests/ApolloInternalTestHelpers/**'
- 'Tests/ApolloServerIntegrationTests/**'
- 'Tests/ApolloInternalTestHelpers/**'
- 'Tests/ApolloTests/**'
codegen:
- 'apollo-ios-codegen/**'
Expand Down Expand Up @@ -246,5 +245,3 @@ jobs:
- name: Run CocoaPods Integration Tests
id: run-cocoapods-integration-tests
uses: ./.github/actions/run-cocoapods-integration-tests

# IntegrationTests removed because source is not compatible with Sendable yet.
77 changes: 1 addition & 76 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ jobs:
filters: |
ios:
- 'apollo-ios/**'
- 'Tests/ApolloInternalTestHelpers/**'
- 'Tests/ApolloServerIntegrationTests/**'
- 'Tests/ApolloInternalTestHelpers/**'
- 'Tests/ApolloTests/**'
codegen:
- 'apollo-ios-codegen/**'
Expand Down Expand Up @@ -259,77 +258,3 @@ jobs:
- name: Run CocoaPods Integration Tests
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
143 changes: 0 additions & 143 deletions .github/workflows/release-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,76 +147,6 @@ jobs:
path: |
TestResults/ResultBundle.zip
# legacy-unit-test:
# runs-on: macos-11
# needs: tuist-generation
# timeout-minutes: 20
# strategy:
# fail-fast: false
# matrix:
# include:
# # iOS 14.4
# - destination: platform=iOS Simulator,OS=14.4,name=iPhone 12
# scheme: ApolloTests
# test-plan: Apollo-CITestPlan
# name: Apollo Unit Tests - iOS 14.4
# name: ${{ matrix.name }}
# steps:
# - name: Checkout Repo
# uses: actions/checkout@v3
# # 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: Retrieve Build Cache
# uses: actions/cache@v3
# with:
# path: |
# ./ApolloDev.xcodeproj
# ./ApolloDev.xcworkspace
# ./Derived/*
# key: ${{ github.run_id }}-dependencies
# fail-on-cache-miss: true
# - uses: maxim-lobanov/setup-xcode@v1
# with:
# xcode-version: 12.4.0
# - name: 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
# uses: actions/upload-artifact@v3
# with:
# name: ${{ matrix.name }}-logs
# path: |
# DerivedData/Logs/Build
# - name: Save crash logs
# uses: actions/upload-artifact@v3
# with:
# name: ${{ matrix.name }}-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: ${{ matrix.name }}-results
# path: |
# TestResults/ResultBundle.zip

run-codegen-test-configurations:
runs-on: macos-latest
timeout-minutes: 20
Expand Down Expand Up @@ -251,76 +181,3 @@ jobs:
- name: Run CocoaPods Integration Tests
id: run-cocoapods-integration-tests
uses: ./.github/actions/run-cocoapods-integration-tests

run-integration-tests:
runs-on: macos-13
needs: tuist-generation
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
3 changes: 0 additions & 3 deletions SimpleUploadServer/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion SimpleUploadServer/.nvmrc

This file was deleted.

50 changes: 0 additions & 50 deletions SimpleUploadServer/file-utils.js

This file was deleted.

71 changes: 0 additions & 71 deletions SimpleUploadServer/index.js

This file was deleted.

Loading

0 comments on commit 51c414e

Please sign in to comment.