Skip to content

Commit

Permalink
fix: remove macos ci test temporary (#625)
Browse files Browse the repository at this point in the history
  • Loading branch information
ruleeeer authored Sep 15, 2024
1 parent 0840333 commit d4e46f9
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,23 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest,macos-latest,windows-latest]
node_version: [16,18]
# remove macos temporarily
os: [ubuntu-latest,windows-latest]
node_version: [18,20]
fail-fast: false

name: 'Build&Test: node-${{ matrix.node_version }}, ${{ matrix.os }}'
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v4
with:
version: 8
version: 9

- name: Cache pnpm modules
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.pnpm-store
key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
Expand Down Expand Up @@ -63,17 +64,17 @@ jobs:
runs-on: ubuntu-latest
name: 'Lint: node-18, ubuntu-latest'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v4
with:
version: 8

- name: Set node version to 18
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 18
cache: 'pnpm'
Expand Down
5 changes: 2 additions & 3 deletions packages/examples/vitestSetup-serve.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { execa } from 'execa';
import { execa } from 'execa'
import { dirname, join, resolve } from 'node:path'
import os from 'node:os'
import fs from 'fs-extra'
Expand All @@ -22,7 +22,7 @@ export const browserErrors: Error[] = []

export let page: Page = undefined!
export let browser: Browser = undefined!
export let viteTestUrl: string = ''
export let viteTestUrl = ''

const DIR = join(os.tmpdir(), 'vitest_playwright_global_setup')

Expand Down Expand Up @@ -68,7 +68,6 @@ beforeAll(async (s) => {
)?.[1]
testDir = dirname(testPath)


// if this is a test placed under examples/xxx/__tests__
// start a vite server in that directory.
if (testName) {
Expand Down
2 changes: 1 addition & 1 deletion vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ export default defineConfig({
testTimeout: 20000
},
esbuild: {
target: 'node14'
target: 'node18'
}
})

0 comments on commit d4e46f9

Please sign in to comment.