diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a42c8117..0c84108e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ 'env': 'GO_VERSION': '1.24.2' - 'NODE_VERSION': '18' + 'NODE_VERSION': '20' 'on': 'push': diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml index b4cc4d1b..95155593 100644 --- a/bamboo-specs/release.yaml +++ b/bamboo-specs/release.yaml @@ -7,7 +7,7 @@ # Make sure to sync any changes with the branch overrides below. 'variables': 'channel': 'edge' - 'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye' + 'dockerFrontend': 'adguard/home-js-builder:3.0' 'dockerGo': 'adguard/go-builder:1.24.2--1' 'stages': @@ -50,7 +50,7 @@ 'docker': 'image': '${bamboo.dockerFrontend}' 'volumes': - '${system.YARN_DIR}': '${bamboo.cacheYarn}' + '${system.NPM_DIR}': '${bamboo.cacheNpm}' 'key': 'BF' 'other': 'clean-working-dir': true @@ -157,6 +157,7 @@ # Print Docker info. docker info + docker buildx version # Prepare and push the build. env \ @@ -277,7 +278,7 @@ # need to build a few of these. 'variables': 'channel': 'beta' - 'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye' + 'dockerFrontend': 'adguard/home-js-builder:3.0' 'dockerGo': 'adguard/go-builder:1.24.2--1' # release-vX.Y.Z branches are the branches from which the actual final # release is built. @@ -293,5 +294,5 @@ # are the ones that actually get released. 'variables': 'channel': 'release' - 'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye' + 'dockerFrontend': 'adguard/home-js-builder:3.0' 'dockerGo': 'adguard/go-builder:1.24.2--1' diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml index cd2e0359..d1e26afb 100644 --- a/bamboo-specs/test.yaml +++ b/bamboo-specs/test.yaml @@ -5,7 +5,7 @@ 'key': 'AHBRTSPECS' 'name': 'AdGuard Home - Build and run tests' 'variables': - 'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye' + 'dockerFrontend': 'adguard/home-js-builder:3.0' 'dockerGo': 'adguard/go-builder:1.24.2--1' 'channel': 'development' @@ -39,7 +39,7 @@ 'docker': 'image': '${bamboo.dockerFrontend}' 'volumes': - '${system.YARN_DIR}': '${bamboo.cacheYarn}' + '${system.NPM_DIR}': '${bamboo.cacheNpm}' 'key': 'JSTEST' 'other': 'clean-working-dir': true @@ -103,7 +103,7 @@ 'docker': 'image': '${bamboo.dockerFrontend}' 'volumes': - '${system.YARN_DIR}': '${bamboo.cacheYarn}' + '${system.NPM_DIR}': '${bamboo.cacheNpm}' 'key': 'BF' 'other': 'clean-working-dir': true @@ -178,7 +178,7 @@ 'docker': 'image': '${bamboo.dockerFrontend}' 'volumes': - '${system.YARN_DIR}': '${bamboo.cacheYarn}' + '${system.NPM_DIR}': '${bamboo.cacheNpm}' 'key': 'E2ETEST' 'other': 'clean-working-dir': true @@ -233,6 +233,6 @@ # Set the default release channel on the release branch to beta, as we # may need to build a few of these. 'variables': - 'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye' + 'dockerFrontend': 'adguard/home-js-builder:3.0' 'dockerGo': 'adguard/go-builder:1.24.2--1' 'channel': 'candidate'