Skip to content

Commit

Permalink
Merge pull request #692 from ember-animation/update-ci-scripts
Browse files Browse the repository at this point in the history
Update ci scripts to node v18
  • Loading branch information
mkszepp authored Aug 6, 2024
2 parents 6a19ede + 3bc0222 commit e92f3f7
Show file tree
Hide file tree
Showing 5 changed files with 101 additions and 62 deletions.
62 changes: 31 additions & 31 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@ on:
pull_request: {}

concurrency:
group: ci-${{ github.head_ref || github.ref }}
cancel-in-progress: true
group: ci-${{ github.head_ref || github.ref }}
cancel-in-progress: true

jobs:
lint:
name: Lint
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3
with:
version: 8

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: pnpm

- name: 'Install dependencies'
Expand All @@ -40,21 +40,21 @@ jobs:
needs: lint

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.4
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: pnpm

- name: Install Dependencies
run: pnpm install --frozen-lockfile

- name: Run Tests
run: pnpm --filter test-app test:ember

Expand All @@ -64,20 +64,20 @@ jobs:
needs: lint

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.4
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8
- uses: actions/setup-node@v3

- uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: pnpm

- name: Install Dependencies
run: pnpm install --frozen-lockfile

- name: Run Tests
run: pnpm --filter test-app test:ember

Expand All @@ -103,21 +103,21 @@ jobs:
- embroider-optimized

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.4
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: pnpm

- name: Install Dependencies
run: pnpm install --frozen-lockfile

- name: Run Tests
env:
EMBER_TRY_SCENARIO: ${{ matrix.try-scenario }}
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ on:
- main
- master
pull_request:

jobs:
lint:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3
with:
version: 8

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: 'pnpm'

- name: 'Install dependencies'
Expand All @@ -35,21 +35,21 @@ jobs:
needs: lint

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3
with:
version: 8

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: pnpm

- name: Install Dependencies
run: pnpm install --frozen-lockfile

- name: Run Tests
run: pnpm --filter docs test:ember

Expand All @@ -59,16 +59,16 @@ jobs:
needs: lint

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v4
with:
version: 8

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: pnpm

- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"tracked-built-ins": "^3.1.1",
"webpack": "^5.88.2",
"bootstrap": "^4.6.0",
"ember-cli-fastboot": "^4.1.1",
"ember-cli-fastboot": "^4.1.5",
"ember-cli-sass": "^11.0.1",
"ember-code-snippet": "git+https://[email protected]/ef4/ember-code-snippet.git#d054b697098ad52481c94a952ccf8d89ba1f25fe",
"ember-moment": "^10.0.0",
Expand Down
65 changes: 52 additions & 13 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"stylelint-prettier": "^4.0.2",
"tracked-built-ins": "^3.1.1",
"webpack": "^5.88.2",
"ember-cli-fastboot": "^4.1.1",
"ember-cli-fastboot": "^4.1.5",
"ember-cli-sass": "^11.0.1",
"ember-code-snippet": "git+https://[email protected]/ef4/ember-code-snippet.git#d054b697098ad52481c94a952ccf8d89ba1f25fe",
"ember-moment": "^10.0.0",
Expand Down

0 comments on commit e92f3f7

Please sign in to comment.