Skip to content

Commit 30f8bab

Browse files
committed
fix: ci
1 parent e1f7b70 commit 30f8bab

File tree

2 files changed

+35
-27
lines changed

2 files changed

+35
-27
lines changed

.github/workflows/ci-components.yml

+20-16
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,28 @@ jobs:
3434
if: needs.conditional-skip.outputs.trigger-ci == 'true'
3535
steps:
3636
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
37+
- name: Install PNPM
38+
uses: pnpm/action-setup@v4
39+
with:
40+
run_install: false
3741
- name: Install Node
3842
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
3943
with:
4044
node-version: ${{ env.NODE_VERSION }}
41-
cache: yarn
42-
cache-dependency-path: yarn.lock
45+
cache: pnpm
4346
- name: Install Dependencies
44-
run: yarn install --immutable
47+
run: pnpm install
4548
- name: Build Components
46-
run: yarn build
49+
run: pnpm build
4750
working-directory: packages/components
4851
- name: Lint Showcase
49-
run: yarn run lint
52+
run: pnpm lint
5053
working-directory: showcase
5154
- name: Lint Components
52-
run: yarn run lint
55+
run: pnpm lint
5356
working-directory: packages/components
5457
- name: Run Tests
55-
run: yarn run test:ember:percy
58+
run: pnpm test:ember:percy
5659
working-directory: showcase
5760
env:
5861
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN_COMPONENTS }}
@@ -67,29 +70,30 @@ jobs:
6770
matrix:
6871
try-scenario:
6972
- ember-lts-3.28
70-
- ember-lts-4.12
71-
# - ember-release
73+
- ember-lts-4.12 # - ember-release
7274
- ember-beta
7375
# - ember-canary
7476
- embroider-safe
7577
# - embroider-optimized
7678

7779
steps:
7880
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
81+
- name: Install PNPM
82+
uses: pnpm/action-setup@v4
83+
with:
84+
run_install: false
7985
- name: Install Node
8086
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
8187
with:
8288
node-version: ${{ env.NODE_VERSION }}
83-
cache: yarn
84-
cache-dependency-path: yarn.lock
89+
cache: pnpm
8590
- name: Install Dependencies
86-
run: yarn install --immutable
91+
run: pnpm install
8792
- name: Build Components
88-
run: yarn build
93+
run: pnpm build
8994
working-directory: packages/components
9095
- name: Run Tests
9196
working-directory: showcase
92-
run: yarn ember try:one ${{ matrix.try-scenario }}
97+
run: pnpm ember try:one ${{ matrix.try-scenario }}
9398
env:
94-
PERCY_ENABLE: 0
95-
YARN_ENABLE_IMMUTABLE_INSTALLS: false
99+
PERCY_ENABLE: 0

.github/workflows/ci-website.yml

+15-11
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@ jobs:
3939
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
4040
with:
4141
node-version: ${{ env.NODE_VERSION }}
42-
cache: yarn
43-
cache-dependency-path: yarn.lock
44-
- name: Install Dependencies
45-
run: yarn install --immutable
42+
cache: pnpm
43+
cache-dependency-path: package-lock.json
44+
- name: Install PNPM
45+
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
46+
with:
47+
run_install: true
4648
- name: Lint
47-
run: yarn run lint
49+
run: pnpm run lint
4850
working-directory: website
4951

5052
test:
@@ -59,13 +61,15 @@ jobs:
5961
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
6062
with:
6163
node-version: ${{ env.NODE_VERSION }}
62-
cache: yarn
63-
cache-dependency-path: yarn.lock
64-
- name: Install Dependencies
65-
run: yarn install --immutable
64+
cache: pnpm
65+
cache-dependency-path: package-lock.json
66+
- name: Install PNPM
67+
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
68+
with:
69+
run_install: true
6670
- name: Build Components
67-
run: yarn build
71+
run: pnpm build
6872
working-directory: packages/components
6973
- name: Run Tests
70-
run: yarn run test:ember
74+
run: pnpm run test:ember
7175
working-directory: website

0 commit comments

Comments
 (0)