From 484dbd8fd0e091f81938642999f630a7ebb06d43 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sat, 17 Feb 2024 23:38:22 +0000 Subject: [PATCH 1/3] remove wyvox/action-setup-pnpm to realign with ember-cli --- files/.github/workflows/ci.yml | 39 ++++++++++++++++----------- files/.github/workflows/push-dist.yml | 14 +++++----- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/files/.github/workflows/ci.yml b/files/.github/workflows/ci.yml index 963d1bce..0467ef7d 100644 --- a/files/.github/workflows/ci.yml +++ b/files/.github/workflows/ci.yml @@ -17,13 +17,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: <%= pnpm ? 'wyvox/action-setup-pnpm@v3' : 'actions/setup-node@v3' %> + - uses: actions/checkout@v4<% if (pnpm) { %> + - uses: pnpm/action-setup@v3 with: - node-version: 16<% if (!pnpm) { %> - cache: <%= yarn ? 'yarn' : 'npm' %> + version: 8<% } %> + - uses: actions/setup-node@v4 + with: + node-version: 18 + cache: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %> - name: Install Dependencies - run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %><%}%> + run: <%= pnpm ? 'pnpm install --frozen-lockfile' : yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %> - name: Lint run: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm run' %> lint - name: Run Tests @@ -34,13 +37,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: <%= pnpm ? 'wyvox/action-setup-pnpm@v3' : 'actions/setup-node@v3' %> + - uses: actions/checkout@v4<% if (pnpm) { %> + - uses: pnpm/action-setup@v3 + with: + version: 8<% } %> + - uses: actions/setup-node@v4 with: - node-version: 16<% if (!pnpm) { %> - cache: <%= yarn ? 'yarn' : 'npm' %> + node-version: 18 + cache: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %> - name: Install Dependencies - run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %><%}%> + run: <%= pnpm ? 'pnpm install --no-lockfile' : yarn ? 'yarn install --no-lockfile' : 'npm install --no-package-lock' %> - name: Run Tests run: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm run' %> test @@ -62,13 +68,16 @@ jobs: - embroider-optimized steps: - - uses: actions/checkout@v3 - - uses: <%= pnpm ? 'wyvox/action-setup-pnpm@v3' : 'actions/setup-node@v3' %> + - uses: actions/checkout@v4<% if (pnpm) { %> + - uses: pnpm/action-setup@v3 + with: + version: 8<% } %> + - uses: actions/setup-node@v4 with: - node-version: 16<% if (!pnpm) { %> - cache: <%= yarn ? 'yarn' : 'npm' %> + node-version: 18 + cache: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %> - name: Install Dependencies - run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %><%}%> + run: <%= pnpm ? 'pnpm install --frozen-lockfile' : yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %> - name: Run Tests run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} --skip-cleanup working-directory: <%= testAppInfo.location %> diff --git a/files/.github/workflows/push-dist.yml b/files/.github/workflows/push-dist.yml index 4addfdb7..c2b044ad 100644 --- a/files/.github/workflows/push-dist.yml +++ b/files/.github/workflows/push-dist.yml @@ -16,14 +16,16 @@ jobs: name: Push dist runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3<% if (pnpm) {%> - - uses: wyvox/action-setup-pnpm@v3<%} else {%> - - name: Install Node - uses: actions/setup-node@v3 + - uses: actions/checkout@v4<% if (pnpm) { %> + - uses: pnpm/action-setup@v3 with: - cache: '<%= yarn ? 'yarn' : 'npm' %>'<% } if (yarn || npm) { %> + version: 8<% } %> + - uses: actions/setup-node@v4 + with: + node-version: 18 + cache: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %> - name: Install Dependencies - run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %><%}%> + run: <%= pnpm ? 'pnpm install --frozen-lockfile' : yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %> - uses: kategengler/put-built-npm-package-contents-on-branch@v2.0.0 with: branch: dist From 5bc0ba2260237e7cf02c34061ae8caae35381306 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sun, 18 Feb 2024 00:31:30 +0000 Subject: [PATCH 2/3] update test fixtures --- .../fixtures/default/.github/workflows/ci.yml | 20 +++++------ .../default/.github/workflows/push-dist.yml | 8 ++--- tests/fixtures/pnpm/.github/workflows/ci.yml | 36 ++++++++++++++----- .../pnpm/.github/workflows/push-dist.yml | 12 +++++-- tests/fixtures/yarn/.github/workflows/ci.yml | 20 +++++------ .../yarn/.github/workflows/push-dist.yml | 8 ++--- 6 files changed, 65 insertions(+), 39 deletions(-) diff --git a/tests/fixtures/default/.github/workflows/ci.yml b/tests/fixtures/default/.github/workflows/ci.yml index ddcdc1b5..967e301a 100644 --- a/tests/fixtures/default/.github/workflows/ci.yml +++ b/tests/fixtures/default/.github/workflows/ci.yml @@ -17,10 +17,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 18 cache: npm - name: Install Dependencies run: npm ci @@ -34,13 +34,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 18 cache: npm - name: Install Dependencies - run: npm ci + run: npm install --no-package-lock - name: Run Tests run: npm run test @@ -62,10 +62,10 @@ jobs: - embroider-optimized steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 18 cache: npm - name: Install Dependencies run: npm ci diff --git a/tests/fixtures/default/.github/workflows/push-dist.yml b/tests/fixtures/default/.github/workflows/push-dist.yml index dd1af6c3..78b61e25 100644 --- a/tests/fixtures/default/.github/workflows/push-dist.yml +++ b/tests/fixtures/default/.github/workflows/push-dist.yml @@ -16,11 +16,11 @@ jobs: name: Push dist runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Install Node - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - cache: 'npm' + node-version: 18 + cache: npm - name: Install Dependencies run: npm ci - uses: kategengler/put-built-npm-package-contents-on-branch@v2.0.0 diff --git a/tests/fixtures/pnpm/.github/workflows/ci.yml b/tests/fixtures/pnpm/.github/workflows/ci.yml index a8d91c00..a02b804c 100644 --- a/tests/fixtures/pnpm/.github/workflows/ci.yml +++ b/tests/fixtures/pnpm/.github/workflows/ci.yml @@ -17,10 +17,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: wyvox/action-setup-pnpm@v3 + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 with: - node-version: 16 + version: 8 + - uses: actions/setup-node@v4 + with: + node-version: 18 + cache: pnpm + - name: Install Dependencies + run: pnpm install --frozen-lockfile - name: Lint run: pnpm lint - name: Run Tests @@ -31,10 +37,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: wyvox/action-setup-pnpm@v3 + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 + with: + version: 8 + - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 18 + cache: pnpm + - name: Install Dependencies + run: pnpm install --no-lockfile - name: Run Tests run: pnpm test @@ -56,10 +68,16 @@ jobs: - embroider-optimized steps: - - uses: actions/checkout@v3 - - uses: wyvox/action-setup-pnpm@v3 + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 + with: + version: 8 + - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 18 + cache: pnpm + - name: Install Dependencies + run: pnpm install --frozen-lockfile - name: Run Tests run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} --skip-cleanup working-directory: test-app diff --git a/tests/fixtures/pnpm/.github/workflows/push-dist.yml b/tests/fixtures/pnpm/.github/workflows/push-dist.yml index 9d780649..b65713e6 100644 --- a/tests/fixtures/pnpm/.github/workflows/push-dist.yml +++ b/tests/fixtures/pnpm/.github/workflows/push-dist.yml @@ -16,8 +16,16 @@ jobs: name: Push dist runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: wyvox/action-setup-pnpm@v3 + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 + with: + version: 8 + - uses: actions/setup-node@v4 + with: + node-version: 18 + cache: pnpm + - name: Install Dependencies + run: pnpm install --frozen-lockfile - uses: kategengler/put-built-npm-package-contents-on-branch@v2.0.0 with: branch: dist diff --git a/tests/fixtures/yarn/.github/workflows/ci.yml b/tests/fixtures/yarn/.github/workflows/ci.yml index f270f054..e1f59f5d 100644 --- a/tests/fixtures/yarn/.github/workflows/ci.yml +++ b/tests/fixtures/yarn/.github/workflows/ci.yml @@ -17,10 +17,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 18 cache: yarn - name: Install Dependencies run: yarn install --frozen-lockfile @@ -34,13 +34,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 18 cache: yarn - name: Install Dependencies - run: yarn install --frozen-lockfile + run: yarn install --no-lockfile - name: Run Tests run: yarn test @@ -62,10 +62,10 @@ jobs: - embroider-optimized steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 18 cache: yarn - name: Install Dependencies run: yarn install --frozen-lockfile diff --git a/tests/fixtures/yarn/.github/workflows/push-dist.yml b/tests/fixtures/yarn/.github/workflows/push-dist.yml index 03de03c2..29673bf9 100644 --- a/tests/fixtures/yarn/.github/workflows/push-dist.yml +++ b/tests/fixtures/yarn/.github/workflows/push-dist.yml @@ -16,11 +16,11 @@ jobs: name: Push dist runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Install Node - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - cache: 'yarn' + node-version: 18 + cache: yarn - name: Install Dependencies run: yarn install --frozen-lockfile - uses: kategengler/put-built-npm-package-contents-on-branch@v2.0.0 From fbe7f28102cb0341003ce6cd9c197d75802ec066 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sun, 18 Feb 2024 00:32:07 +0000 Subject: [PATCH 3/3] remove wyvox/action-setup-pnpm from this repo --- .github/workflows/ci.yml | 60 +++++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a2be85c..6f311250 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,8 +17,16 @@ jobs: name: Lint JS runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: wyvox/action-setup-pnpm@v2 + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 + with: + version: 8 + - uses: actions/setup-node@v4 + with: + node-version: 18 + cache: pnpm + - name: Install Dependencies + run: pnpm install --frozen-lockfile - name: ESLint run: pnpm lint @@ -28,8 +36,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: wyvox/action-setup-pnpm@v2 + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 + with: + version: 8 + - uses: actions/setup-node@v4 + with: + node-version: 18 + cache: pnpm + - name: Install Dependencies + run: pnpm install --frozen-lockfile - run: pnpm tsc --noEmit working-directory: tests @@ -65,8 +81,16 @@ jobs: - declarations-configuration steps: - - uses: actions/checkout@v3 - - uses: wyvox/action-setup-pnpm@v2 + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 + with: + version: 8 + - uses: actions/setup-node@v4 + with: + node-version: 18 + cache: pnpm + - name: Install Dependencies + run: pnpm install --frozen-lockfile - run: pnpm add --global ember-cli yarn - run: pnpm vitest --testNamePattern "${{ matrix.slow-test }}" working-directory: tests @@ -88,8 +112,16 @@ jobs: - defaults with yarn - defaults with pnpm steps: - - uses: actions/checkout@v3 - - uses: wyvox/action-setup-pnpm@v2 + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 + with: + version: 8 + - uses: actions/setup-node@v4 + with: + node-version: 18 + cache: pnpm + - name: Install Dependencies + run: pnpm install --frozen-lockfile - run: pnpm add --global ember-cli@${{ matrix.ember-cli }} yarn - run: pnpm vitest --testNamePattern "${{ matrix.slow-test }}" working-directory: tests @@ -111,8 +143,16 @@ jobs: - typescript with yarn - typescript with pnpm steps: - - uses: actions/checkout@v3 - - uses: wyvox/action-setup-pnpm@v2 + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 + with: + version: 8 + - uses: actions/setup-node@v4 + with: + node-version: 18 + cache: pnpm + - name: Install Dependencies + run: pnpm install --frozen-lockfile - run: pnpm add --global ember-cli@${{ matrix.ember-cli }} yarn - run: pnpm vitest --testNamePattern "${{ matrix.slow-test }}" working-directory: tests