Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove wyvox/action-setup-pnpm to realign with ember-cli #259

Merged
merged 3 commits into from
Feb 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 50 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
39 changes: 24 additions & 15 deletions files/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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 %>
14 changes: 8 additions & 6 deletions files/.github/workflows/push-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
branch: dist
Expand Down
20 changes: 10 additions & 10 deletions tests/fixtures/default/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tests/fixtures/default/.github/workflows/push-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
Expand Down
36 changes: 27 additions & 9 deletions tests/fixtures/pnpm/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
12 changes: 10 additions & 2 deletions tests/fixtures/pnpm/.github/workflows/push-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
branch: dist
Expand Down
20 changes: 10 additions & 10 deletions tests/fixtures/yarn/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tests/fixtures/yarn/.github/workflows/push-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
Expand Down