From e48f6132f09f24b5869964555ac1368b5b46a66e Mon Sep 17 00:00:00 2001 From: Markus Sanin Date: Tue, 12 Nov 2024 07:07:36 +0100 Subject: [PATCH] Update ci (force re-sync injected deps) --- .github/workflows/ci.yml | 50 ++++++++++++++++++++++++-------------- .github/workflows/docs.yml | 13 ++++++++-- package.json | 1 - 3 files changed, 43 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6dcab1fa..25eeeeeb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,8 @@ jobs: lint: name: Lint runs-on: ubuntu-latest - + timeout-minutes: 10 + steps: - uses: actions/checkout@v4 @@ -26,10 +27,12 @@ jobs: - uses: actions/setup-node@v4 with: node-version: 18.x - cache: 'pnpm' + cache: pnpm - name: 'Install dependencies' run: pnpm install --frozen-lockfile + - run: pnpm build + - run: pnpm i -f # re-sync injected deps - name: Lint run: pnpm --filter ember-basic-dropdown lint @@ -41,20 +44,23 @@ jobs: steps: - uses: actions/checkout@v4 - + - uses: pnpm/action-setup@v3 with: version: 8 - + - name: Install Node uses: actions/setup-node@v4 with: node-version: 18.x - cache: 'pnpm' - + cache: pnpm + - name: Install Dependencies run: pnpm install --frozen-lockfile - + + - run: pnpm build + - run: pnpm i -f # re-sync injected deps + - name: Run Tests run: pnpm --filter test-app test:ember @@ -78,6 +84,9 @@ jobs: - name: Install Dependencies run: pnpm install --frozen-lockfile + + - run: pnpm build + - run: pnpm i -f # re-sync injected deps - name: Run Tests run: pnpm --filter test-app test:ember-shadow-dom @@ -89,19 +98,22 @@ jobs: steps: - uses: actions/checkout@v4 - + - uses: pnpm/action-setup@v3 with: version: 8 - + - uses: actions/setup-node@v4 with: node-version: 18.x - cache: 'pnpm' - + cache: pnpm + - name: Install Dependencies run: pnpm install --frozen-lockfile - + + - run: pnpm build + - run: pnpm i -f # re-sync injected deps + - name: Run Tests run: pnpm --filter test-app test:ember @@ -130,21 +142,23 @@ jobs: steps: - uses: actions/checkout@v4 - + - uses: pnpm/action-setup@v3 with: version: 8 - + - name: Install Node uses: actions/setup-node@v4 with: node-version: 18.x - cache: 'pnpm' - + cache: pnpm + - name: Install Dependencies run: pnpm install --frozen-lockfile - + - run: pnpm build + - run: pnpm i -f # re-sync injected deps + - name: Run Tests env: EMBER_TRY_SCENARIO: ${{ matrix.try-scenario }} - run: pnpm --filter test-app test:ember-try $EMBER_TRY_SCENARIO + run: pnpm --filter test-app test:ember-try $EMBER_TRY_SCENARIO --skip-cleanup diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index bab9c5e5..8b676250 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -32,6 +32,9 @@ jobs: - name: 'Install dependencies' run: pnpm install --frozen-lockfile + - run: pnpm build + - run: pnpm i -f # re-sync injected deps + - name: Lint run: pnpm --filter docs lint @@ -55,7 +58,10 @@ jobs: - name: Install Dependencies run: pnpm install --frozen-lockfile - + + - run: pnpm build + - run: pnpm i -f # re-sync injected deps + - name: Run Tests run: pnpm --filter docs test:ember @@ -80,10 +86,13 @@ jobs: - name: Install Dependencies run: pnpm install --frozen-lockfile + + - run: pnpm build + - run: pnpm i -f # re-sync injected deps - name: Run Tests run: pnpm --filter docs build - + - name: Setup Pages uses: actions/configure-pages@v5 diff --git a/package.json b/package.json index f509cffa..483bfdb2 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,6 @@ "build:docs": "pnpm run --filter docs build", "lint": "pnpm run --filter '*' lint", "lint:fix": "pnpm run --filter '*' lint:fix", - "prepare": "pnpm run build", "start": "concurrently 'pnpm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "pnpm run --filter ember-basic-dropdown start --no-watch.clearScreen", "start:docs": "pnpm run --filter docs start --preserveWatchOutput",