Skip to content

Commit 9988c50

Browse files
committed
webapp: enable corepack to use fixed version of yarn
1 parent f992650 commit 9988c50

File tree

4 files changed

+29
-7
lines changed

4 files changed

+29
-7
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,11 @@ jobs:
9393
python -m pip install --upgrade pip
9494
pip install --upgrade platformio setuptools
9595
96+
- name: Enable Corepack
97+
run: |
98+
cd webapp
99+
corepack enable
100+
96101
- name: Setup Node.js and yarn
97102
uses: actions/setup-node@v4
98103
with:
@@ -101,10 +106,14 @@ jobs:
101106
cache-dependency-path: "webapp/yarn.lock"
102107

103108
- name: Install WebApp dependencies
104-
run: yarn --cwd webapp install --frozen-lockfile
109+
run: |
110+
cd webapp
111+
yarn install --frozen-lockfile
105112
106113
- name: Build WebApp
107-
run: yarn --cwd webapp build
114+
run: |
115+
cd webapp
116+
yarn build
108117
109118
- name: Build firmware
110119
run: pio run -e ${{ matrix.environment }}

.github/workflows/yarnlint.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88

9+
defaults:
10+
run:
11+
working-directory: webapp
12+
913
steps:
1014
- uses: actions/checkout@v4
15+
- name: Enable Corepack
16+
run: corepack enable
1117
- name: Setup Node.js and yarn
1218
uses: actions/setup-node@v4
1319
with:
@@ -16,7 +22,7 @@ jobs:
1622
cache-dependency-path: "webapp/yarn.lock"
1723

1824
- name: Install WebApp dependencies
19-
run: yarn --cwd webapp install --frozen-lockfile
25+
run: yarn install --frozen-lockfile
2026

2127
- name: Linting
22-
run: yarn --cwd webapp lint
28+
run: yarn lint

.github/workflows/yarnprettier.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88

9+
defaults:
10+
run:
11+
working-directory: webapp
12+
913
steps:
1014
- uses: actions/checkout@v4
15+
- name: Enable Corepack
16+
run: corepack enable
1117
- name: Setup Node.js and yarn
1218
uses: actions/setup-node@v4
1319
with:
@@ -16,7 +22,7 @@ jobs:
1622
cache-dependency-path: "webapp/yarn.lock"
1723

1824
- name: Install WebApp dependencies
19-
run: yarn --cwd webapp install --frozen-lockfile
25+
run: yarn install --frozen-lockfile
2026

2127
- name: Check Formatting
22-
run: yarn --cwd webapp prettier --check src/
28+
run: yarn prettier --check src/

webapp/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,6 @@
4646
"vite-plugin-compression": "^0.5.1",
4747
"vite-plugin-css-injected-by-js": "^3.5.1",
4848
"vue-tsc": "^2.0.29"
49-
}
49+
},
50+
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
5051
}

0 commit comments

Comments
 (0)