From 1a8fcb55e6339f2dba4bb23637f1eb08f3d59324 Mon Sep 17 00:00:00 2001 From: Giles Thompson Date: Fri, 29 Sep 2023 13:53:08 +1300 Subject: [PATCH] Use wyvox/action-setup-pnpm (#998) Tidy up to simplify workflow files. Should be a no-op --- .github/workflows/ci.yml | 51 ++++---------------------------- .github/workflows/website-ci.yml | 10 +------ 2 files changed, 7 insertions(+), 54 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39979168..970b0d8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,17 +18,9 @@ jobs: with: fetch-depth: 1 - - uses: pnpm/action-setup@v2.4.0 - with: - version: 8 - - - uses: actions/setup-node@v3 + - uses: wyvox/action-setup-pnpm@v3 with: node-version: '${{ env.NODE_VERSION }}' - cache: 'pnpm' - - - name: 'Install dependencies' - run: pnpm install --frozen-lockfile - name: Lint run: pnpm --filter ember-file-upload lint @@ -43,17 +35,9 @@ jobs: with: fetch-depth: 1 - - uses: pnpm/action-setup@v2.4.0 - with: - version: 8 - - - uses: actions/setup-node@v3 + - uses: wyvox/action-setup-pnpm@v3 with: node-version: '${{ env.NODE_VERSION }}' - cache: 'pnpm' - - - name: 'Install dependencies' - run: pnpm install --frozen-lockfile - name: Test run: pnpm --filter test-app test:ember --launch chrome @@ -76,17 +60,9 @@ jobs: with: fetch-depth: 1 - - uses: pnpm/action-setup@v2.4.0 - with: - version: 8 - - - uses: actions/setup-node@v3 + - uses: wyvox/action-setup-pnpm@v3 with: node-version: '${{ env.NODE_VERSION }}' - cache: 'pnpm' - - - name: 'Install dependencies' - run: pnpm install --frozen-lockfile - name: 'Change TS to ${{ matrix.typescript-scenario }}' run: 'pnpm add --save-dev ${{ matrix.typescript-scenario}}' @@ -108,17 +84,10 @@ jobs: with: fetch-depth: 1 - - uses: pnpm/action-setup@v2.4.0 - with: - version: 8 - - - uses: actions/setup-node@v3 + - uses: wyvox/action-setup-pnpm@v3 with: node-version: '${{ env.NODE_VERSION }}' - cache: 'pnpm' - - - name: 'Install dependencies' - run: rm pnpm-lock.yaml && pnpm install + args: --no-lockfile - name: Test run: pnpm --filter test-app test:ember --launch chrome @@ -148,17 +117,9 @@ jobs: with: fetch-depth: 1 - - uses: pnpm/action-setup@v2.4.0 - with: - version: 8 - - - uses: actions/setup-node@v3 + - uses: wyvox/action-setup-pnpm@v3 with: node-version: '${{ env.NODE_VERSION }}' - cache: 'pnpm' - - - name: 'Install dependencies' - run: pnpm install --frozen-lockfile - name: Test env: diff --git a/.github/workflows/website-ci.yml b/.github/workflows/website-ci.yml index 1b7396e9..0df34454 100644 --- a/.github/workflows/website-ci.yml +++ b/.github/workflows/website-ci.yml @@ -18,17 +18,9 @@ jobs: with: fetch-depth: 1 - - uses: pnpm/action-setup@v2.4.0 - with: - version: 8 - - - uses: actions/setup-node@v3 + - uses: wyvox/action-setup-pnpm@v3 with: node-version: '${{ env.NODE_VERSION }}' - cache: 'pnpm' - - - name: 'Install dependencies' - run: pnpm install --frozen-lockfile - name: Lint run: pnpm --filter website lint