Skip to content

Commit

Permalink
Merge pull request #880 from StackStorm/renovate/node-14.x
Browse files Browse the repository at this point in the history
Update Node.js
  • Loading branch information
arm4b authored Oct 3, 2022
2 parents 719ff1a + 235c3f8 commit 14d0e95
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 34 deletions.
14 changes: 7 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
29 changes: 12 additions & 17 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,31 @@ Changelog
========================================================================

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.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


Changed
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Removed
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Contributed by @luislobo


v2.4.3
------------------------------------------------------------------------
------
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14.16.1
FROM node:14.20.0

# Create app directory
WORKDIR /opt/stackstorm/static/webui/st2web
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14.16.1
FROM node:14.20.0

# Create app directory
WORKDIR /opt/stackstorm/static/webui/st2web
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-nginx
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-nginx-dev
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"repository": "stackstorm/st2web",
"engines": {
"node": "^14.16.1",
"node": "14.20.1",
"npm": "6.14.12"
},
"browserify": {
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 14d0e95

Please sign in to comment.