Skip to content

Commit

Permalink
merge integration-test monorepo into root monorepo (#421)
Browse files Browse the repository at this point in the history
* move integration-test monorepo into root monorepo

* update test workflow

* `--raw-output`

* use field directly, no jq

* update dependencies to point at workspace
  • Loading branch information
phryneas authored Jan 24, 2025
1 parent 723c704 commit 543ec64
Show file tree
Hide file tree
Showing 28 changed files with 5,629 additions and 16,464 deletions.
22 changes: 3 additions & 19 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,30 +75,19 @@ jobs:
fail-fast: false
matrix:
version: ${{ fromJson(needs.matrix.outputs.version) }}
defaults:
run:
working-directory: ./integration-test
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "20.x"
cache: "yarn"
- name: Install Packages (Root)
run: yarn install --immutable --mode=skip-build
working-directory: ./
- name: Set target version of Apollo Client (Root)
run: yarn workspaces foreach --all --include "@apollo/*" add -D -P @apollo/client@${{ matrix.version }}
working-directory: ./

- name: Install Packages (Integration Test)
run: |
yarn install
run: npm pkg set resolutions.@apollo/client=$(npm view @apollo/client@${{ matrix.version }} version)
- run: yarn install --mode=skip-build
env:
YARN_ENABLE_IMMUTABLE_INSTALLS: "false"

- name: Set target version of Apollo Client (Integration Test)
run: yarn workspaces foreach --all --include "@integration-test/*" --exclude @integration-test/shared add @apollo/client@${{ matrix.version }}
- run: yarn build:libs

- name: Get installed Playwright version
id: playwright-version
Expand Down Expand Up @@ -127,11 +116,6 @@ jobs:
- name: "Next.js: Test"
run: yarn workspace @integration-test/nextjs run test | tee $GITHUB_STEP_SUMMARY; exit ${PIPESTATUS[0]}

- name: "Experimentally patched React: Build"
run: yarn workspace @integration-test/experimental-react run build
- name: "Experimentally patched React: Test"
run: yarn workspace @integration-test/experimental-react run test | tee $GITHUB_STEP_SUMMARY; exit ${PIPESTATUS[0]}

- name: "Vite Streaming: Build"
run: yarn workspace @integration-test/vite-streaming run build
- name: "Vite Streaming: Test"
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/vercel-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ jobs:
if: github.event_name == 'deployment_status' && github.event.deployment_status.state == 'success' && github.event.deployment_status.environment == 'Preview – apollo__experimental-nextjs-app-support'
runs-on: ubuntu-latest
name: Run Playwright tests against Vercel deployment
defaults:
run:
working-directory: ./integration-test
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
Expand All @@ -25,12 +22,7 @@ jobs:
cache: "yarn"
- name: Install Packages (Root)
run: yarn install --immutable --mode=skip-build
working-directory: ./
- name: Install Packages (Integration Test)
run: |
yarn install
env:
YARN_ENABLE_IMMUTABLE_INSTALLS: "false"
- run: yarn build:libs

- name: Get installed Playwright version
id: playwright-version
Expand Down
17 changes: 0 additions & 17 deletions integration-test/.yarnrc.yml

This file was deleted.

14 changes: 0 additions & 14 deletions integration-test/experimental-react/index.html

This file was deleted.

36 changes: 0 additions & 36 deletions integration-test/experimental-react/package.json

This file was deleted.

21 changes: 0 additions & 21 deletions integration-test/experimental-react/playwright.config.ts

This file was deleted.

95 changes: 0 additions & 95 deletions integration-test/experimental-react/server.js

This file was deleted.

81 changes: 0 additions & 81 deletions integration-test/experimental-react/src/App.css

This file was deleted.

Loading

0 comments on commit 543ec64

Please sign in to comment.