From dee4e8fc92b2fdc48a67c8e0ba6c263120f34460 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 11 Apr 2023 13:20:19 -0700 Subject: [PATCH 1/2] chore: simplify Svelte 4 CI --- .github/workflows/ci.yml | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2d708fd5130..15f0c35f6ff1 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,11 +19,6 @@ 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 From 1bd3cc512c2df1144bfa6694f8062637dc80513e Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 11 Apr 2023 13:27:20 -0700 Subject: [PATCH 2/2] fix --- .github/workflows/ci.yml | 2 -- package.json | 2 +- scripts/skip_in_ci.js | 7 ------- 3 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 scripts/skip_in_ci.js diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15f0c35f6ff1..0a4d83558f1a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,8 +20,6 @@ jobs: node-version: ${{ matrix.node-version }} cache: npm - run: npm install - env: - SKIP_PREPARE: true - run: npm run test:integration env: CI: true diff --git a/package.json b/package.json index 80a6be1276a2..79f0f7c7848d 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 d845d000ab3f..000000000000 --- 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" }); -}