Skip to content

Commit

Permalink
Merge pull request #3632 from snyk/chore/upgrade_pkg_test
Browse files Browse the repository at this point in the history
Chore/upgrade pkg
  • Loading branch information
PeterSchafer authored Aug 31, 2022
2 parents 11ac5f8 + 3f93319 commit 7ceadd5
Show file tree
Hide file tree
Showing 9 changed files with 314 additions and 171 deletions.
2 changes: 1 addition & 1 deletion .circleci/chocolatey.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<package id="gradle" version="6.8.3" />
<package id="sbt" version="1.5.5" />
<package id="awscli" version="2.4.12" />
<package id="nodejs" version="16.14.2" />
<package id="nodejs" version="16.16.0" />
<package id="go" version="1.18.2" />
<package id="mitmproxy" version="7.0.4" />
</packages>
25 changes: 18 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ parameters:
node_version:
type: string
# https://circleci.com/developer/images/image/cimg/node
default: '16.14.2'
default: '16.16.0'
npm_version:
type: string
# match whatever's bundled with node_version
Expand Down Expand Up @@ -74,7 +74,7 @@ commands:
default: /mnt/ramdisk/.npm
npm_global_sudo:
type: boolean
default: true
default: false
npm_install:
type: boolean
default: false
Expand Down Expand Up @@ -335,7 +335,6 @@ jobs:
at: .
- install_sdks_windows
- setup_npm:
npm_global_sudo: false
npm_install: true # reinstalling as workspace node_modules is for linux
npm_cache_directory: ~\AppData\Local\npm-cache
- run:
Expand All @@ -358,7 +357,6 @@ jobs:
at: .
- install_sdks_macos
- setup_npm:
npm_global_sudo: false
npm_install: true # reinstalling as workspace node_modules is for linux
npm_cache_directory: /Users/distiller/.npm
- run:
Expand Down Expand Up @@ -387,6 +385,7 @@ jobs:
sudo apt install nodejs npm
- setup_npm:
npm_cache_directory: /home/circleci/.npm
npm_global_sudo: true
- run:
name: Configuring artifact
command: << parameters.test_snyk_command >> config set "api=${SNYK_API_KEY}"
Expand All @@ -413,6 +412,7 @@ jobs:
sudo apt install nodejs npm
- setup_npm:
npm_cache_directory: /home/circleci/.npm
npm_global_sudo: true
- run:
name: Configuring artifact
command: << parameters.test_snyk_command >> config set "api=${SNYK_API_KEY}"
Expand All @@ -425,6 +425,8 @@ jobs:
parameters:
node_version:
type: string
npm_global_sudo:
type: boolean
executor:
name: docker-node
node_version: << parameters.node_version >>
Expand All @@ -439,6 +441,7 @@ jobs:
at: .
- install_sdks_linux
- setup_npm:
npm_global_sudo: << parameters.npm_global_sudo >>
node_version: << parameters.node_version >>
- run:
name: Configuring Snyk CLI
Expand Down Expand Up @@ -805,7 +808,15 @@ workflows:
- Build
matrix:
parameters:
node_version: ['12.22.11', '14.19.1', '16.14.2']
node_version: ['12.22.11', '14.20.0', '16.16.0']
npm_global_sudo: [true, false]
exclude:
- node_version: '12.22.11'
npm_global_sudo: false
- node_version: '14.20.0'
npm_global_sudo: false
- node_version: '16.16.0'
npm_global_sudo: true
- test-tap:
name: Tap Tests
context: nodejs-install
Expand Down Expand Up @@ -894,8 +905,8 @@ workflows:
- Lint
- Tap Tests
- Jest Tests (Node v12.22.11)
- Jest Tests (Node v14.19.1)
- Jest Tests (Node v16.14.2)
- Jest Tests (Node v14.20.0)
- Jest Tests (Node v16.16.0)
- Acceptance Tests (snyk-win.exe)
- Acceptance Tests (snyk-macos)
- Acceptance Tests (snyk-linux)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '16.14.2'
node-version: '16.16.0'
cache: 'npm'
- run: npm ci
- run: npx ts-node ./scripts/check-dependencies.ts
2 changes: 1 addition & 1 deletion .github/workflows/cli-alert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '16.14.2'
node-version: '16.16.0'
cache: 'npm'
- run: npm ci
- run: npm start
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/danger-zone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '16.14.2'
node-version: '16.16.0'
cache: 'npm'
- run: npm ci
- run: npx danger ci
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.14.2
16.16.0
2 changes: 1 addition & 1 deletion docker-desktop/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -euo pipefail

platform="${1}"
arch="${2}"
node_version="v16.14.2"
node_version="v16.16.0"
node_url="https://nodejs.org/dist/${node_version}/node-${node_version}-${platform}-${arch}.tar.gz"
build_name="snyk-for-docker-desktop-${platform}-${arch}"
build_filename="${build_name}.tar.gz"
Expand Down
Loading

0 comments on commit 7ceadd5

Please sign in to comment.