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

Modernize all the things #2

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
yarn -> pnpm
RobbieTheWagner committed Mar 25, 2024

Verified

This commit was signed with the committer’s verified signature.
emilwareus Emil Wåreus
commit 0247a493a68b96669310112d963b78c2630fb8a5
39 changes: 13 additions & 26 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -22,31 +22,14 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Lint
run: yarn lint
- name: Run Tests
run: yarn test:ember

floating:
name: "Floating Dependencies"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
node-version: 18.x
- uses: pnpm/action-setup@v2
with:
node-version: 18
cache: yarn
version: 8
- name: Install Dependencies
run: yarn install --no-lockfile
run: pnpm install --frozen-lockfile
- name: Run Tests
run: yarn test:ember

run: pnpm test
try-scenarios:
name: ${{ matrix.try-scenario }}
runs-on: ubuntu-latest
@@ -59,6 +42,7 @@ jobs:
try-scenario:
- ember-lts-4.8
- ember-lts-4.12
- ember-lts-5.4
- ember-release
- ember-beta
- ember-canary
@@ -70,9 +54,12 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
node-version: 18.x
- uses: pnpm/action-setup@v2
with:
version: 8
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
working-directory: test-app
run: pnpm ember try:one ${{ matrix.try-scenario }}
2 changes: 1 addition & 1 deletion tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
"codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true,
"options": [
"--yarn",
"--pnpm",
"--no-welcome"
]
}
10 changes: 9 additions & 1 deletion tests/dummy/config/ember-try.js
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');

module.exports = async function () {
return {
useYarn: true,
usePnpm: true,
scenarios: [
{
name: 'ember-lts-4.8',
@@ -23,6 +23,14 @@ module.exports = async function () {
},
},
},
{
name: 'ember-lts-5.4',
npm: {
devDependencies: {
'ember-source': '~5.4.0',
},
},
},
{
name: 'ember-release',
npm: {