Skip to content

Commit

Permalink
Merge branch 'master' into mergify/bp/master/pr-3149
Browse files Browse the repository at this point in the history
  • Loading branch information
bjoernricks authored Sep 23, 2021
2 parents 0684517 + fc8dfeb commit 847e189
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 21 deletions.
12 changes: 9 additions & 3 deletions .docker/testing/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ FROM greenbone/gvm-libs-$VERSION-$COMPILER-build
ARG DEBIAN_FRONTEND=noninteractive

# Install curl and gnupg to add remote repositories
# Add repository for yarn
# Add repository for yarn & nodejs
RUN apt-get update && apt-get install --assume-yes \
curl \
gnupg \
Expand All @@ -21,13 +21,19 @@ RUN apt-get update && apt-get install --assume-yes \
https://dl.yarnpkg.com/debian/pubkey.gpg \
| apt-key add - && \
echo "deb http://dl.yarnpkg.com/debian/ stable main" \
> /etc/apt/sources.list.d/yarn.list
> /etc/apt/sources.list.d/yarn.list \
&& curl --silent --show-error \
https://deb.nodesource.com/gpgkey/nodesource.gpg.key \
| apt-key add - && \
echo "deb https://deb.nodesource.com/node_14.x buster main" \
> /etc/apt/sources.list.d/nodesource.list

# Install node.js and yarn for gsa
# Install Debian core dependencies required for building gsad

RUN apt-get update && apt-get install --assume-yes \
nodejs \
libmicrohttpd-dev \
nodejs \
yarn \
libxml2-dev \
libxslt1-dev \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
# ubuntu lts: https://packages.ubuntu.com/focal/nodejs
# 12.x for ubuntu-latest: https://packages.ubuntu.com/hirsute/nodejs
# 14.x is recommended by https://nodejs.org/en/
node-version: [10.x]
node-version: [14.x]
steps:
- uses: actions/[email protected]
- name: Set up node ${{ matrix.python-version }}
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
runs-on: 'ubuntu-latest'
strategy:
matrix:
node-version: [10.x]
node-version: [14.x]
steps:
- uses: actions/[email protected]
- name: Set up node ${{ matrix.python-version }}
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Added new license page [#3138](https://github.com/greenbone/gsa/pull/3138), [#3160](https://github.com/greenbone/gsa/pull/3160)
- Added command for getting appliance license information [#3137](https://github.com/greenbone/gsa/pull/3137)
### Changed
- Require node.js >= 14 [#3164](https://github.com/greenbone/gsa/pull/3164)
### Fixed
### Removed
- Removed interface access from users in GSA and gsad [#3123](https://github.com/greenbone/gsa/pull/3123)
Expand Down
8 changes: 7 additions & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,15 @@ Compiling Greenbone Security Assistant GUI
------------------------------------------

Prerequisites for using the GUI:
* node.js >= 8.0
* node.js >= 14.0
* Either yarn >= 1.0 or npm. yarn is faster and more reliable, but younger.

Install node.js >= 14 on Debian GNU/Linux:
```sh
curl --silent --show-error https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
echo "deb https://deb.nodesource.com/node_14.x buster main" > /etc/apt/sources.list.d/nodesource.list
apt-get install -y nodejs
```

Developing Greenbone Security Assistant GUI
-------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion gsa/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ project (gsa VERSION 21.10.0 LANGUAGES)

set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

find_package (Node 10.0 REQUIRED)
find_package (Node 14.0 REQUIRED)
find_package (Yarn 1.0)

if (NOT DEFINED PROJECT_VERSION_STRING)
Expand Down
4 changes: 2 additions & 2 deletions gsa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"license": "AGPL-3.0+",
"main": "src/index.js",
"engines": {
"node": ">=10.0"
"node": ">=14.0"
},
"eslintConfig": {
"extends": "react-app"
Expand Down Expand Up @@ -83,7 +83,7 @@
"@babel/cli": "^7.15.7",
"@storybook/react": "^6.3.8",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^11.2.7",
"@testing-library/react": "^12.1.0",
"@types/jest": "^27.0.1",
"@testing-library/user-event": "^13.2.1",
"babel-plugin-i18next-extract": "^0.8.3",
Expand Down
45 changes: 33 additions & 12 deletions gsa/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2614,6 +2614,17 @@
"@types/yargs" "^16.0.0"
chalk "^4.0.0"

"@jest/types@^27.1.1":
version "27.1.1"
resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.1.1.tgz#77a3fc014f906c65752d12123a0134359707c0ad"
integrity sha512-yqJPDDseb0mXgKqmNqypCsb85C22K1aY5+LUxh7syIM9n/b0AsaltxNy+o6tt29VcfGDpYEve175bm3uOhcehA==
dependencies:
"@types/istanbul-lib-coverage" "^2.0.0"
"@types/istanbul-reports" "^3.0.0"
"@types/node" "*"
"@types/yargs" "^16.0.0"
chalk "^4.0.0"

"@material-ui/core@^4":
version "4.11.3"
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.3.tgz#f22e41775b0bd075e36a7a093d43951bf7f63850"
Expand Down Expand Up @@ -3543,19 +3554,19 @@
"@svgr/plugin-svgo" "^5.5.0"
loader-utils "^2.0.0"

"@testing-library/dom@^7.28.1":
version "7.28.1"
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.28.1.tgz#dea78be6e1e6db32ddcb29a449e94d9700c79eb9"
integrity sha512-acv3l6kDwZkQif/YqJjstT3ks5aaI33uxGNVIQmdKzbZ2eMKgg3EV2tB84GDdc72k3Kjhl6mO8yUt6StVIdRDg==
"@testing-library/dom@^8.0.0":
version "8.6.0"
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.6.0.tgz#c92ba5b714882eabfd7f25d8f5c59d4a4b0bfcac"
integrity sha512-EDBMEWK8IVpNF7B7C1knb0lLB4Si9RWte/YTEi6CqmqUK5CYCoecwOOG9pEijU/H6s3u0drUxH5sKT07FCgFIg==
dependencies:
"@babel/code-frame" "^7.10.4"
"@babel/runtime" "^7.12.5"
"@types/aria-query" "^4.2.0"
aria-query "^4.2.2"
chalk "^4.1.0"
dom-accessibility-api "^0.5.4"
dom-accessibility-api "^0.5.6"
lz-string "^1.4.4"
pretty-format "^26.6.2"
pretty-format "^27.0.2"

"@testing-library/jest-dom@^5.14.1":
version "5.14.1"
Expand All @@ -3572,13 +3583,13 @@
lodash "^4.17.15"
redent "^3.0.0"

"@testing-library/react@^11.2.7":
version "11.2.7"
resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.7.tgz#b29e2e95c6765c815786c0bc1d5aed9cb2bf7818"
integrity sha512-tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA==
"@testing-library/react@^12.1.0":
version "12.1.0"
resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.0.tgz#3e9a4002b0b8f986a738a2f88fc458b5af319f35"
integrity sha512-Ge3Ht3qXE82Yv9lyPpQ7ZWgzo/HgOcHu569Y4ZGWcZME38iOFiOg87qnu6hTEa8jTJVL7zYovnvD3GE2nsNIoQ==
dependencies:
"@babel/runtime" "^7.12.5"
"@testing-library/dom" "^7.28.1"
"@testing-library/dom" "^8.0.0"

"@testing-library/user-event@^13.2.1":
version "13.2.1"
Expand Down Expand Up @@ -7339,7 +7350,7 @@ doctrine@^3.0.0:
dependencies:
esutils "^2.0.2"

dom-accessibility-api@^0.5.4, dom-accessibility-api@^0.5.6:
dom-accessibility-api@^0.5.6:
version "0.5.6"
resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.6.tgz#3f5d43b52c7a3bd68b5fb63fa47b4e4c1fdf65a9"
integrity sha512-DplGLZd8L1lN64jlT27N9TVSESFR5STaEJvX+thCby7fuCHonfPpAlodYc3vuUYbDuDec5w8AMP7oCM5TWFsqw==
Expand Down Expand Up @@ -13844,6 +13855,16 @@ pretty-format@^27.0.0, pretty-format@^27.0.6:
ansi-styles "^5.0.0"
react-is "^17.0.1"

pretty-format@^27.0.2:
version "27.2.0"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.2.0.tgz#ee37a94ce2a79765791a8649ae374d468c18ef19"
integrity sha512-KyJdmgBkMscLqo8A7K77omgLx5PWPiXJswtTtFV7XgVZv2+qPk6UivpXXO+5k6ZEbWIbLoKdx1pZ6ldINzbwTA==
dependencies:
"@jest/types" "^27.1.1"
ansi-regex "^5.0.0"
ansi-styles "^5.0.0"
react-is "^17.0.1"

pretty-hrtime@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
Expand Down

0 comments on commit 847e189

Please sign in to comment.