From 932cb66a36bd0b08f6aa2d69188f4c78436aa35c Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Wed, 12 Apr 2023 00:00:19 -0700 Subject: [PATCH] chore: simplify Svelte 4 CI (#8487) --- .github/workflows/ci.yml | 42 ---------------------------------------- package.json | 2 +- scripts/skip_in_ci.js | 7 ------- 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 scripts/skip_in_ci.js diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2d708fd51..0a4d83558f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,42 +6,7 @@ on: permissions: contents: read # to fetch code (actions/checkout) jobs: - Setup: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, windows-latest, macOS-latest] - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 18 - cache: npm - - run: npm install - env: - SKIP_PREPARE: true - - run: npm run build - env: - PUBLISH: true - - name: Upload build assets - id: upload-artifact - uses: actions/upload-artifact@v3 - with: - name: build-assets - path: | - index.* - compiler.* - ssr.* - action/ - animate/ - easing/ - internal/ - motion/ - store/ - transition/ - types/ Tests: - needs: Setup runs-on: ${{ matrix.os }} timeout-minutes: 15 strategy: @@ -54,14 +19,7 @@ jobs: with: node-version: ${{ matrix.node-version }} cache: npm - - name: Download build assets - uses: actions/download-artifact@v3 - id: download-artifact - with: - name: build-assets - run: npm install - env: - SKIP_PREPARE: true - run: npm run test:integration env: CI: true diff --git a/package.json b/package.json index 80a6be1276..79f0f7c784 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "test:unit": "mocha --config .mocharc.unit.js --exit", "quicktest": "mocha --exit", "build": "rollup -c && npm run tsd", - "prepare": "node scripts/skip_in_ci.js npm run build", + "prepare": "npm run build", "dev": "rollup -cw", "posttest": "agadoo internal/index.mjs", "prepublishOnly": "node check_publish_env.js && npm run lint && npm run build && npm test", diff --git a/scripts/skip_in_ci.js b/scripts/skip_in_ci.js deleted file mode 100644 index d845d000ab..0000000000 --- a/scripts/skip_in_ci.js +++ /dev/null @@ -1,7 +0,0 @@ -if (process.env.SKIP_PREPARE) { - console.log('Skipped "prepare" script'); -} else { - const { execSync } = require("child_process"); - const command = process.argv.slice(2).join(" "); - execSync(command, { stdio: "inherit" }); -}