@@ -11,19 +11,47 @@ jobs:
1111 build_date : ${{ steps.data.outputs.builddate }}
1212 version : ${{ steps.data.outputs.version }}
1313 steps :
14+ - name : Install Node.js
15+ uses : actions/setup-node@v3
16+ with :
17+ node-version : 16
18+
1419 - uses : actions/checkout@v3
1520 with :
1621 submodules : recursive
1722 token : ${{ secrets.ROBOT_TOKEN }}
1823
24+ - uses : pnpm/action-setup@v2
25+ name : Install pnpm
26+ id : pnpm-install
27+ with :
28+ version : 7
29+ run_install : false
30+
31+ - name : Get pnpm store directory
32+ id : pnpm-cache
33+ shell : bash
34+ run : |
35+ echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
36+
37+ - uses : actions/cache@v3
38+ name : Setup pnpm cache
39+ with :
40+ path : ${{ steps.pnpm-cache.outputs.STORE_PATH }}
41+ key : ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
42+ restore-keys : |
43+ ${{ runner.os }}-pnpm-store-
44+
45+ - name : Install dependencies
46+ run : pnpm install
47+
1948 - name : Setup gluon
2049 run : |
21- yarn
2250 npm i -g gluon-build@next
2351
2452 - name : Bump version
2553 run : |
26- yarn gluon ci --brand alpha --bump prerelease
54+ pnpm gluon ci --brand alpha --bump prerelease
2755
2856 - name : Debug
2957 run : |
4977 needs : [build-data]
5078
5179 steps :
80+ - name : Install Node.js
81+ uses : actions/setup-node@v3
82+ with :
83+ node-version : 16
84+
5285 - uses : actions/checkout@v3
5386 with :
5487 submodules : recursive
@@ -99,19 +132,39 @@ jobs:
99132 with :
100133 path : /home/runner/.cache/sccache
101134 key : ${{ runner.os }}-sccache
135+
136+ - uses : pnpm/action-setup@v2
137+ name : Install pnpm
138+ id : pnpm-install
139+ with :
140+ version : 7
141+ run_install : false
102142
103- - name : Setup gluon
143+ - name : Get pnpm store directory
144+ id : pnpm-cache
145+ shell : bash
104146 run : |
105- yarn
147+ echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
148+
149+ - uses : actions/cache@v3
150+ name : Setup pnpm cache
151+ with :
152+ path : ${{ steps.pnpm-cache.outputs.STORE_PATH }}
153+ key : ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
154+ restore-keys : |
155+ ${{ runner.os }}-pnpm-store-
156+
157+ - name : Install dependencies
158+ run : pnpm install
106159
107160 - name : Load gluon CI setup
108- run : yarn gluon ci --brand alpha --display-version ${{ needs.build-data.outputs.version }}
161+ run : pnpm gluon ci --brand alpha --display-version ${{ needs.build-data.outputs.version }}
109162
110163 - name : Download firefox source and dependencies
111- run : yarn download
164+ run : pnpm download
112165
113166 - name : Import
114- run : yarn imp
167+ run : pnpm imp
115168
116169 - name : Bootstrap
117170 run : |
@@ -120,10 +173,10 @@ jobs:
120173 cd ..
121174
122175 - name : Build
123- run : yarn build
176+ run : pnpm build
124177
125178 - name : Package
126- run : yarn package
179+ run : pnpm package
127180
128181 - name : Rename artifacts
129182 run : |
@@ -153,6 +206,11 @@ jobs:
153206 needs : [build-data]
154207
155208 steps :
209+ - name : Install Node.js
210+ uses : actions/setup-node@v3
211+ with :
212+ node-version : 16
213+
156214 - uses : actions/checkout@v3
157215 with :
158216 submodules : recursive
@@ -186,17 +244,37 @@ jobs:
186244 path : ~/Library/Caches/Mozilla.sccache
187245 key : ${{ runner.os }}-sccache
188246
189- - name : Setup gluon
190- run : yarn
247+ - uses : pnpm/action-setup@v2
248+ name : Install pnpm
249+ id : pnpm-install
250+ with :
251+ version : 7
252+ run_install : false
191253
254+ - name : Get pnpm store directory
255+ id : pnpm-cache
256+ shell : bash
257+ run : |
258+ echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
259+
260+ - uses : actions/cache@v3
261+ name : Setup pnpm cache
262+ with :
263+ path : ${{ steps.pnpm-cache.outputs.STORE_PATH }}
264+ key : ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
265+ restore-keys : |
266+ ${{ runner.os }}-pnpm-store-
267+
268+ - name : Install dependencies
269+ run : pnpm install
192270 - name : Load gluon CI setup
193- run : yarn gluon ci -- --brand alpha --display-version ${{ needs.build-data.outputs.version }}
271+ run : pnpm gluon ci -- --brand alpha --display-version ${{ needs.build-data.outputs.version }}
194272
195273 - name : Download firefox source and dependancies
196- run : yarn download
274+ run : pnpm download
197275
198276 - name : Import
199- run : yarn imp
277+ run : pnpm imp
200278
201279 - name : Bootstrap
202280 run : |
@@ -205,10 +283,10 @@ jobs:
205283 cd ..
206284
207285 - name : Gluon build
208- run : yarn build --verbose
286+ run : pnpm build --verbose
209287
210288 - name : Package
211- run : yarn gluon package
289+ run : pnpm gluon package
212290
213291 - name : Rename artifacts
214292 run : |
@@ -238,6 +316,11 @@ jobs:
238316 needs : [build-data]
239317
240318 steps :
319+ - name : Install Node.js
320+ uses : actions/setup-node@v3
321+ with :
322+ node-version : 16
323+
241324 - uses : actions/checkout@v3
242325 with :
243326 submodules : recursive
@@ -247,17 +330,38 @@ jobs:
247330 git config --global user.email "trickypr@users.noreply.github.com"
248331 git config --global user.name "TrickyPR"
249332
250- - name : Setup gluon
251- run : yarn
333+ - uses : pnpm/action-setup@v2
334+ name : Install pnpm
335+ id : pnpm-install
336+ with :
337+ version : 7
338+ run_install : false
339+
340+ - name : Get pnpm store directory
341+ id : pnpm-cache
342+ shell : bash
343+ run : |
344+ echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
345+
346+ - uses : actions/cache@v3
347+ name : Setup pnpm cache
348+ with :
349+ path : ${{ steps.pnpm-cache.outputs.STORE_PATH }}
350+ key : ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
351+ restore-keys : |
352+ ${{ runner.os }}-pnpm-store-
353+
354+ - name : Install dependencies
355+ run : pnpm install
252356
253357 - name : Load gluon CI setup
254- run : yarn gluon ci -- --brand alpha --display-version ${{ needs.build-data.outputs.version }}
358+ run : pnpm gluon ci -- --brand alpha --display-version ${{ needs.build-data.outputs.version }}
255359
256360 - name : Download firefox source and dependancies
257- run : yarn download --verbose
361+ run : pnpm download --verbose
258362
259363 - name : Import
260- run : yarn imp --verbose
364+ run : pnpm imp --verbose
261365
262366 - name : Compress
263367 run : |
@@ -283,28 +387,28 @@ jobs:
283387
284388 - name : Install dependencies
285389 run : |
286- yarn
390+ pnpm i
287391
288392 - name : Load gluon CI setup
289- run : yarn gluon ci -- --brand alpha --display-version ${{ needs.build-data.outputs.version }}
393+ run : pnpm gluon ci -- --brand alpha --display-version ${{ needs.build-data.outputs.version }}
290394
291395 - name : Download
292- run : yarn download
396+ run : pnpm download
293397
294398 - name : Import
295- run : yarn imp
399+ run : pnpm imp
296400
297401 - name : Build
298402 shell : powershell.exe C:\mozilla-build\start-shell.bat "{0}"
299403 run : |
300404 cd /c/actions-runner/_work/browser/browser # mozillabuild defaults to ~
301- yarn build --skip-patch-check
405+ pnpm build --skip-patch-check
302406
303407 - name : Package
304408 shell : powershell.exe C:\mozilla-build\start-shell.bat "{0}"
305409 run : |
306410 cd /c/actions-runner/_work/browser/browser # mozillabuild defaults to ~
307- yarn package
411+ pnpm package
308412 mv ./dist/output.mar windows.mar
309413
310414 - name : Upload artifact
0 commit comments