From eed0951858dfaafacf0d9b40715b16aad78b8aa6 Mon Sep 17 00:00:00 2001 From: Luke Watts Date: Thu, 26 Sep 2024 12:55:38 +0100 Subject: [PATCH 1/2] chore(ci): remove use of EOL node --- .github/workflows/smoke-tests.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 81697b999e..9412b8ec9e 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -18,14 +18,14 @@ jobs: matrix: os: [ubuntu, macos, windows] snyk_install_method: [binary, npm, yarn, brew] - node_version: [16, 18, 20] + node_version: [18, 20] exclude: # Skip yarn for Windows, as it's a bit crazy to get it working in CI environment. Unless we see evidence we need it, I'd avoid it - snyk_install_method: yarn os: windows # For binary, use only the Node 18 - snyk_install_method: binary - node_version: 16 + node_version: 18 # No need to run brew tests on some Platforms - snyk_install_method: brew os: ubuntu @@ -40,14 +40,14 @@ jobs: snyk_cli_dl_file: snyk-macos - snyk_install_method: alpine-binary os: ubuntu - node_version: 16 + node_version: 18 snyk_cli_dl_file: snyk-alpine - snyk_install_method: npm-root-user os: ubuntu - node_version: 16 + node_version: 18 - snyk_install_method: docker-bundle os: macos - node_version: 16 + node_version: 18 snyk_cli_dl_file: snyk-for-docker-desktop-darwin-x64.tar.gz steps: From f87338218b8b88fd97a9c51accd8004da98dd1e9 Mon Sep 17 00:00:00 2001 From: Luke Watts Date: Thu, 26 Sep 2024 12:59:35 +0100 Subject: [PATCH 2/2] chore(ci): update to use downloads.snyk.io --- test/smoke/alpine/entrypoint.sh | 2 +- test/smoke/install-snyk-binary-win.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/smoke/alpine/entrypoint.sh b/test/smoke/alpine/entrypoint.sh index 64e1d78543..634d916612 100755 --- a/test/smoke/alpine/entrypoint.sh +++ b/test/smoke/alpine/entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/sh -curl -Lo ./snyk-cli 'https://static.snyk.io/cli/latest/snyk-alpine' +curl -Lo ./snyk-cli 'https://downloads.snyk.io/cli/latest/snyk-alpine' chmod -R +x ./snyk-cli mv ./snyk-cli /usr/local/bin/snyk snyk --version diff --git a/test/smoke/install-snyk-binary-win.sh b/test/smoke/install-snyk-binary-win.sh index 8ea1d24e72..6e51370028 100644 --- a/test/smoke/install-snyk-binary-win.sh +++ b/test/smoke/install-snyk-binary-win.sh @@ -1,4 +1,4 @@ -curl -Lo ./snyk-cli.exe 'https://static.snyk.io/cli/latest/snyk-win.exe' +curl -Lo ./snyk-cli.exe 'https://downloads.snyk.io/cli/latest/snyk-win.exe' ./snyk-cli.exe --version chmod -R +x ./snyk-cli mv ./snyk-cli.exe "/bin/snyk.exe"