From e79981e8bb71d5b44ee2bf329187e72e6662d52b Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Thu, 5 Oct 2023 17:52:01 +0300 Subject: [PATCH] Pull request 2023: upd-node Squashed commit of the following: commit 83b0aa9703a7fd023eeb82a4fdf43a5717a3d9cf Author: Ainar Garipov Date: Thu Oct 5 17:42:38 2023 +0300 all: upd node --- .github/workflows/build.yml | 2 +- CHANGELOG.md | 4 ++++ README.md | 4 ++-- bamboo-specs/release.yaml | 6 +++--- bamboo-specs/snapcraft.yaml | 6 +++--- bamboo-specs/test.yaml | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9a48519..d2d0096d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ 'env': 'GO_VERSION': '1.20.8' - 'NODE_VERSION': '14' + 'NODE_VERSION': '16' 'on': 'push': diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f857fc8..500b46ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,10 @@ NOTE: Add new changes BELOW THIS COMMENT. - Ability to specify for how long clients should cache a filtered response, using the *Blocked response TTL* field on the *DNS settings* page ([#4569]). +### Changed + +- Node 16 is now required to build the frontend. + ### Fixed - Improper validation of password length ([#6280]). diff --git a/README.md b/README.md index 16f94b6f..82c618b3 100644 --- a/README.md +++ b/README.md @@ -262,8 +262,8 @@ Run `make init` to prepare the development environment. You will need this to build AdGuard Home: * [Go](https://golang.org/dl/) v1.20 or later; - * [Node.js](https://nodejs.org/en/download/) v10.16.2 or later; - * [npm](https://www.npmjs.com/) v6.14 or later; + * [Node.js](https://nodejs.org/en/download/) v16 or later; + * [npm](https://www.npmjs.com/) v8 or later; * [yarn](https://yarnpkg.com/) v1.22.5 or later. diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml index 7ee86906..5b83c60b 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' - 'dockerGo': 'adguard/golang-ubuntu:7.1' + 'dockerGo': 'adguard/golang-ubuntu:7.2' 'stages': - 'Build frontend': @@ -272,7 +272,7 @@ # need to build a few of these. 'variables': 'channel': 'beta' - 'dockerGo': 'adguard/golang-ubuntu:7.1' + 'dockerGo': 'adguard/golang-ubuntu:7.2' # release-vX.Y.Z branches are the branches from which the actual final # release is built. - '^release-v[0-9]+\.[0-9]+\.[0-9]+': @@ -287,4 +287,4 @@ # are the ones that actually get released. 'variables': 'channel': 'release' - 'dockerGo': 'adguard/golang-ubuntu:7.1' + 'dockerGo': 'adguard/golang-ubuntu:7.2' diff --git a/bamboo-specs/snapcraft.yaml b/bamboo-specs/snapcraft.yaml index 20df25bd..a9d5e7f5 100644 --- a/bamboo-specs/snapcraft.yaml +++ b/bamboo-specs/snapcraft.yaml @@ -10,7 +10,7 @@ # Make sure to sync any changes with the branch overrides below. 'variables': 'channel': 'edge' - 'dockerGo': 'adguard/golang-ubuntu:7.1' + 'dockerGo': 'adguard/golang-ubuntu:7.2' 'snapcraftChannel': 'edge' 'stages': @@ -191,7 +191,7 @@ # need to build a few of these. 'variables': 'channel': 'beta' - 'dockerGo': 'adguard/golang-ubuntu:7.1' + 'dockerGo': 'adguard/golang-ubuntu:7.2' 'snapcraftChannel': 'beta' # release-vX.Y.Z branches are the branches from which the actual final # release is built. @@ -207,5 +207,5 @@ # are the ones that actually get released. 'variables': 'channel': 'release' - 'dockerGo': 'adguard/golang-ubuntu:7.1' + 'dockerGo': 'adguard/golang-ubuntu:7.2' 'snapcraftChannel': 'candidate' diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml index 33cad20c..bb2fda63 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': - 'dockerGo': 'adguard/golang-ubuntu:7.1' + 'dockerGo': 'adguard/golang-ubuntu:7.2' 'stages': - 'Tests':