Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update test coverage to include more Node and Windows tests #4144

Merged
merged 3 commits into from
Aug 5, 2022
Merged

update test coverage to include more Node and Windows tests #4144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bcb9d1
update node test coverage to include v18, more windows tests
FredKSchott Aug 4, 2022
7a9fb3c
chore(ci): update turbo to account for OS and NODE_VERSION
natemoo-re Aug 5, 2022
6daec19
chore: disable node@18, add TODO
natemoo-re Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 28 additions & 22 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ env:
FORCE_COLOR: true
ASTRO_TELEMETRY_DISABLED: true


jobs:
lint:
name: Lint
Expand Down Expand Up @@ -79,8 +80,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]
node_version: [14]
OS: [ubuntu-latest]
NODE_VERSION: [14]
fail-fast: true
steps:
- name: Checkout
Expand All @@ -89,10 +90,10 @@ jobs:
- name: Setup PNPM
uses: pnpm/action-setup@v2.2.1

- name: Setup node@${{ matrix.node_version }}
- name: Setup node@${{ matrix.NODE_VERSION }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node_version }}
node-version: ${{ matrix.NODE_VERSION }}
cache: 'pnpm'

- name: Install dependencies
Expand All @@ -102,30 +103,31 @@ jobs:
run: pnpm run build

test:
name: 'Test: ${{ matrix.os }} (node@${{ matrix.node_version }})'
name: 'Test: ${{ matrix.os }} (node@${{ matrix.NODE_VERSION }})'
runs-on: ${{ matrix.os }}
needs: build
strategy:
matrix:
os: [ubuntu-latest]
node_version: [14, 16]
OS: [ubuntu-latest, windows-latest]
# TODO: Enable node@18!
NODE_VERSION: [14, 16]
include:
- os: windows-latest
node_version: 14
- os: macos-latest
node_version: 14
NODE_VERSION: 14
fail-fast: false
env:
NODE_VERSION: ${{ matrix.NODE_VERSION }}
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup PNPM
uses: pnpm/action-setup@v2.2.1

- name: Setup node@${{ matrix.node_version }}
- name: Setup node@${{ matrix.NODE_VERSION }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node_version }}
node-version: ${{ matrix.NODE_VERSION }}
cache: 'pnpm'

- name: Use Deno
Expand All @@ -143,26 +145,28 @@ jobs:
run: pnpm run test

e2e:
name: 'Test (E2E): ${{ matrix.os }} (node@${{ matrix.node_version }})'
name: 'Test (E2E): ${{ matrix.os }} (node@${{ matrix.NODE_VERSION }})'
runs-on: ${{ matrix.os }}
timeout-minutes: 20
needs: build
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
node_version: [14]
OS: [ubuntu-latest, windows-latest]
NODE_VERSION: [14]
fail-fast: false
env:
NODE_VERSION: ${{ matrix.NODE_VERSION }}
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup PNPM
uses: pnpm/action-setup@v2.2.1

- name: Setup node@${{ matrix.node_version }}
- name: Setup node@${{ matrix.NODE_VERSION }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node_version }}
node-version: ${{ matrix.NODE_VERSION }}
cache: 'pnpm'

- name: Install dependencies
Expand All @@ -175,24 +179,26 @@ jobs:
run: pnpm run test:e2e

smoke:
name: 'Test (Smoke): ${{ matrix.os }} (node@${{ matrix.node_version }})'
name: 'Test (Smoke): ${{ matrix.os }} (node@${{ matrix.NODE_VERSION }})'
runs-on: ${{ matrix.os }}
needs: build
strategy:
matrix:
os: [ubuntu-latest]
node_version: [14]
OS: [ubuntu-latest]
NODE_VERSION: [14]
env:
NODE_VERSION: ${{ matrix.NODE_VERSION }}
Comment on lines +189 to +190
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Expose current NODE_VERSION as env variable, used by Turborepo to calculate hash

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup PNPM
uses: pnpm/action-setup@v2.2.1

- name: Setup node@${{ matrix.node_version }}
- name: Setup node@${{ matrix.NODE_VERSION }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node_version }}
node-version: ${{ matrix.NODE_VERSION }}
cache: 'pnpm'

- name: Checkout docs
Expand Down
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"format:imports": "organize-imports-cli ./packages/*/tsconfig.json ./packages/*/*/tsconfig.json",
"test": "turbo run test --output-logs=new-only --concurrency=1",
"test:match": "cd packages/astro && pnpm run test:match",
"test:templates": "turbo run test --filter=create-astro --concurrency=1",
"test:smoke": "turbo run build --filter=\"@example/*\" --filter=\"astro.build\" --filter=\"docs\" --output-logs=new-only --concurrency=1",
"test:vite-ci": "turbo run test --output-logs=new-only --no-deps --scope=astro --concurrency=1",
"test:e2e": "cd packages/astro && pnpm playwright install && pnpm run test:e2e",
Expand Down
9 changes: 5 additions & 4 deletions turbo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
"cache": false
},
"test": {
"outputs": []
},
"test:templates": {
"outputs": []
"outputs": [],
"dependsOn": [
"$RUNNER_OS",
"$NODE_VERSION"
]
Comment on lines +18 to +21
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We needed to exposes these variables to dependsOn so that tests are not hashed only on the file contents. This means test runs will be hashed on the files contents and the current OS and version of Node.

},
"benchmark": {
"dependsOn": ["^build"],
Expand Down