Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support node 18 [HEAD-497] #4911

Merged
merged 23 commits into from
Oct 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .circleci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
faketime \
zip \
nodejs=$(apt-cache policy nodejs | grep nodesource | xargs | cut -d " " -f2)
RUN node -v
RUN apt-get auto-remove -y && apt-get clean -y && rm -rf /var/lib/apt/

# install aws cli
Expand Down
28 changes: 6 additions & 22 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ executors:
- image: alpine:3.17
docker-amd64:
docker:
- image: bastiandoetsch209/cli-build:20230912-103845
- image: bastiandoetsch209/cli-build:20231012-101806
working_directory: /mnt/ramdisk/snyk
resource_class: large
docker-arm64:
docker:
- image: bastiandoetsch209/cli-build-arm64:20230912-103845
- image: bastiandoetsch209/cli-build-arm64:20231012-101806
working_directory: /mnt/ramdisk/snyk
resource_class: arm.large
linux-ubuntu-mantic-amd64:
Expand Down Expand Up @@ -214,25 +214,6 @@ commands:
os: win
- install-deps-windows-signing

install-deps-windows-node:
steps:
- restore_cache:
name: Restoring Chocolatey cache
keys:
- chocolatey-cache-v3-{{ arch }}-{{ checksum ".circleci/chocolatey.config" }}
- run:
name: Install Windows dependencies
shell: bash.exe
command: |
choco uninstall nodejs -y
choco uninstall nodejs.install -y
choco install nodejs --version=$(head .nvmrc) --no-progress -y
- save_cache:
name: Saving Chocolatey cache
key: chocolatey-cache-v3-{{ arch }}-{{ checksum ".circleci/chocolatey.config" }}
paths:
- ~\AppData\Local\Temp\chocolatey

install-deps-noop:
steps:
- run:
Expand Down Expand Up @@ -822,7 +803,7 @@ jobs:
- run:
name: Running Tap tests
command:
npx tap -Rspec --timeout=300 --node-arg=-r --node-arg=ts-node/register \
npx tap -j 1 -C --timeout=300 --node-arg=-r --node-arg=ts-node/register --allow-incomplete-coverage \
$(circleci tests glob "test/tap/*.test.*" | circleci tests split --split-by=timings)

build-special-artifacts:
Expand Down Expand Up @@ -1096,10 +1077,13 @@ jobs:
- run:
name: Checking Snyk CLI
shell: bash
environment:
SNYK_DISABLE_ANALYTICS: 1
command: |
PIP_BREAK_SYSTEM_PACKAGES=1 pip install --user --upgrade requests || PIP_BREAK_SYSTEM_PACKAGES=1 pip3 install --user --upgrade requests
python scripts/install-snyk.py --base_url=<< parameters.cli_download_base_url >> $(cat binary-releases/version) || python3 scripts/install-snyk.py --base_url=<< parameters.cli_download_base_url >> $(cat binary-releases/version)
SNYK_TOKEN=${TEST_SNYK_TOKEN} ./snyk whoami --experimental
SNYK_TOKEN=${TEST_SNYK_TOKEN} ./snyk woof

release-s3:
executor: docker-amd64
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ test/**/.gradle
test-output
test-results
tap-output

.tap
# Jest
coverage
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.16.0
18.18.1
Loading
Loading