From 32cc62384cfe513e7fd85c6fb4696ce24514c6a3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 25 Sep 2022 18:20:08 +0000 Subject: [PATCH 1/4] Update Node.js --- Dockerfile | 2 +- Dockerfile-dev | 2 +- Dockerfile-nginx | 2 +- Dockerfile-nginx-dev | 2 +- package.json | 4 ++-- yarn.lock | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8210289b..fe31ee43c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14.16.1 +FROM node:14.20.0 # Create app directory WORKDIR /opt/stackstorm/static/webui/st2web diff --git a/Dockerfile-dev b/Dockerfile-dev index 99412e8ef..c47aabdc6 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -1,4 +1,4 @@ -FROM node:14.16.1 +FROM node:14.20.0 # Create app directory WORKDIR /opt/stackstorm/static/webui/st2web diff --git a/Dockerfile-nginx b/Dockerfile-nginx index f39833644..dd2660d1d 100644 --- a/Dockerfile-nginx +++ b/Dockerfile-nginx @@ -1,4 +1,4 @@ -FROM node:14.16.1 as build +FROM node:14.20.0 as build # Create app directory WORKDIR /opt/stackstorm/static/webui/st2web diff --git a/Dockerfile-nginx-dev b/Dockerfile-nginx-dev index 403aa2caa..93ddc2a29 100644 --- a/Dockerfile-nginx-dev +++ b/Dockerfile-nginx-dev @@ -1,4 +1,4 @@ -FROM node:14.16.1 as build +FROM node:14.20.0 as build # Create app directory WORKDIR /opt/stackstorm/static/webui/st2web diff --git a/package.json b/package.json index e65029b10..c2afc9ea5 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "repository": "stackstorm/st2web", "engines": { - "node": "^14.16.1", + "node": "14.20.1", "npm": "6.14.12" }, "browserify": { @@ -79,7 +79,7 @@ "minimatch": "^3.0.4", "mixin-deep": "^1.3.2", "moment": "2.24.0", - "node": "^14.16.1", + "node": "14.20.1", "node-uuid": "^1.4.8", "open": "^8.4.0", "qs": "^6.10.2", diff --git a/yarn.lock b/yarn.lock index 8893029e1..4713d3508 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8446,10 +8446,10 @@ node.extend@^1.0.10: has "^1.0.3" is "^3.2.1" -node@^14.16.1: - version "14.16.1" - resolved "https://registry.yarnpkg.com/node/-/node-14.16.1.tgz#8a075d50b249152d09c18ac6d45f60a5359a537a" - integrity sha512-SFe89UaWbT8XM3GHrbohdCyZtxAJZt2FYt6orZP9Dyig2EuEV+S8k5cNoDJbokVbXyYLoUv1kHEg60MaYsepVg== +node@14.20.1: + version "14.20.1" + resolved "https://registry.yarnpkg.com/node/-/node-14.20.1.tgz#09e5d4a06d48fdcbeca1ec1ae10bbe02901d36b9" + integrity sha512-X+ds8FIkd5O+o6uuZKjP8ONH64PN8B+bsR2atkyx5anwruCPRyqHQRFQzG80Ymxv/lptRm3emXvvVpiMLl2qLg== dependencies: node-bin-setup "^1.0.0" From 805f6d9cc0df19421ae0f3884e865628b5a12f36 Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Mon, 3 Oct 2022 22:47:48 +0100 Subject: [PATCH 2/4] Add Changelog for nodes update --- CHANGELOG.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f4a58317d..566a9619c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,3 +11,8 @@ Added - Button gets disabled onClick on `Connect` and `Submit` in st2-login and st2-history module respectively Contributed by @ParthS007 + +Changed +~~~~~~~ + +* Updated nodejs from `14.16.1` to `14.20.0`, fixing the build under ARM processor architecture (#880) From f267859d2f3b0896fd534a11d530ef7660e46e5d Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Mon, 3 Oct 2022 23:00:29 +0100 Subject: [PATCH 3/4] Bump node in CircleCI config --- .circleci/config.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3f257f2a7..0f43c3128 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,8 +33,8 @@ jobs: set +e export NVM_DIR="/opt/circleci/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" - nvm install 14.16.1 - nvm alias default v14.16.1 + nvm install 14.20.1 + nvm alias default v14.20.1 # Each step uses the same `$BASH_ENV`, so need to modify it echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV @@ -57,18 +57,18 @@ jobs: sudo apt-get update sudo apt-get install rpm jq devscripts debhelper gem install package_cloud - nvm use 14.16.1 + nvm use 14.20.1 npm install --global lerna yarn - run: name: Install package dependencies command: | - nvm use 14.16.1 + nvm use 14.20.1 lerna bootstrap - run: name: Run unit tests command: | - nvm use 14.16.1 + nvm use 14.20.1 npm run test-unit - run: @@ -127,13 +127,13 @@ jobs: - run: name: Make deb packages command: | - nvm use 14.16.1 + nvm use 14.20.1 make deb echo $DEB | tr ' ' '\n' | xargs -I{} cp -vr ../st2web_*.{deb,changes} ~/artifacts/{} - run: name: Make RPM packages command: | - nvm use 14.16.1 + nvm use 14.20.1 make rpm echo $RPM | tr ' ' '\n' | xargs -I{} cp -vr ../st2web-*.rpm ~/artifacts/{} - store_artifacts: From 235c3f8d33368aa42782a855c3e2441b51d28ad9 Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Mon, 3 Oct 2022 23:30:52 +0100 Subject: [PATCH 4/4] Update CHANGELOG.rst --- CHANGELOG.rst | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 273528d04..da77c0c35 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,26 +7,25 @@ in development Added ~~~~~ +* Added feature for disabling button for synchronous responses. Button gets disabled onClick on `Connect` and `Submit` in st2-login and st2-history module respectively. -* Added feature for disabling button for synchronous responses - - Button gets disabled onClick on `Connect` and `Submit` in st2-login and st2-history module respectively. - - Contributed by @ParthS007 + Contributed by @ParthS007 Changed ~~~~~~~ - -* Updated nodejs from `14.16.1` to `14.20.0`, fixing the build under ARM processor architecture (#880) +* Updated nodejs from `14.16.1` to `14.20.1`, fixing the local build under ARM processor architecture. #880 + + Reported by @cded from @Bitovi Fixed ~~~~~ * Fixed CircleCI tests - Contributed by @amanda11 + Contributed by @amanda11 * Handle cases where content-type is not only application/json - Contributed by @luislobo + Contributed by @luislobo v2.4.3