Skip to content

Commit 80c9ec4

Browse files
committed
AG-41223 set pnpm cache directory for build run
Squashed commit of the following: commit 170977f Author: Slava Leleka <[email protected]> Date: Mon Apr 14 14:09:09 2025 -0400 Revert "fix puppeteerArgs for tests" This reverts commit f803933. commit 0a4cd38 Author: Slava Leleka <[email protected]> Date: Mon Apr 14 13:54:10 2025 -0400 no cache for tests commit f803933 Author: Slava Leleka <[email protected]> Date: Mon Apr 14 13:50:51 2025 -0400 fix puppeteerArgs for tests commit 322fb3f Author: Slava Leleka <[email protected]> Date: Mon Apr 14 13:44:58 2025 -0400 update puppeteer-runner commit 8f63e30 Merge: b93d0e6 bb766bb Author: Slava Leleka <[email protected]> Date: Mon Apr 14 13:44:26 2025 -0400 Merge branch 'master' into fix/AG-41223 commit b93d0e6 Author: Slava Leleka <[email protected]> Date: Fri Apr 11 18:44:08 2025 -0400 cleanup commit ee4a38a Author: Slava Leleka <[email protected]> Date: Fri Apr 11 18:03:05 2025 -0400 add pnpm ignored-builds for checking commit 498a13a Author: Slava Leleka <[email protected]> Date: Fri Apr 11 17:14:17 2025 -0400 fix specs - set pnpm cache directory
1 parent bb766bb commit 80c9ec4

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

bamboo-specs/build.yaml

+11-2
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,20 @@ Build:
3131
- |-
3232
set -e
3333
set -x
34-
ls -alt
34+
35+
# Fix mixed logs
36+
exec 2>&1
37+
38+
ls -laht
39+
40+
# Set cache directory
41+
pnpm config set store-dir ${bamboo.cachePnpm}
3542
3643
pnpm install
44+
3745
pnpm build
38-
pnpm pack && mv adguard-scriptlets-*.tgz scriptlets.tgz
46+
47+
pnpm pack --out scriptlets.tgz
3948
4049
pnpm wiki
4150
- inject-variables:

bamboo-specs/test.yaml

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plan:
55
key: SCRIPTLETSTEST
66
name: scriptlets - test new
77
variables:
8-
dockerPuppeteer: adguard/puppeteer-runner:22.14--24.5--0
8+
dockerPuppeteer: adguard/puppeteer-runner:22.14--24.5--1
99

1010
stages:
1111
- Build:
@@ -29,7 +29,11 @@ Build:
2929
- |-
3030
set -e
3131
set -x
32-
ls -alt
32+
33+
# Fix mixed logs
34+
exec 2>&1
35+
36+
ls -laht
3337
3438
pnpm install
3539

0 commit comments

Comments
 (0)