Skip to content

Commit

Permalink
fix: smoke test matrix (#4426)
Browse files Browse the repository at this point in the history
  • Loading branch information
michelkaporin committed Feb 20, 2023
1 parent 08095ee commit edf268b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
17 changes: 11 additions & 6 deletions .github/workflows/smoke-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: false # we care about other platforms and channels building
matrix:
os: [ubuntu, macos, windows]
snyk_install_method: [binary, npm, yarn]
snyk_install_method: [binary, npm, yarn, brew]
node_version: [12, 14, 16]
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
Expand All @@ -27,23 +27,28 @@ jobs:
node_version: 12
- snyk_install_method: binary
node_version: 16
# No need to run brew tests on some Platforms
- snyk_install_method: brew
os: ubuntu
- snyk_install_method: brew
os: windows
include:
- snyk_install_method: binary
os: ubuntu
snyk_cli_dl_file: snyk-linux
- snyk_install_method: binary
os: macos
snyk_cli_dl_file: snyk-macos
# Homebrew installation
- snyk_install_method: brew
os: macos
- snyk_install_method: alpine-binary
os: ubuntu
node_version: 16
snyk_cli_dl_file: snyk-alpine
- snyk_install_method: npm-root-user
os: ubuntu
node_version: 16
- snyk_install_method: docker-bundle
os: macos
node_version: 16
snyk_cli_dl_file: snyk-for-docker-desktop-darwin-x64.tar.gz

steps:
Expand Down Expand Up @@ -85,7 +90,7 @@ jobs:
docker run -eCI=1 -eSMOKE_TESTS_SNYK_TOKEN -eGITHUB_TOKEN snyk-cli-alpine
- name: Install snyk from Docker bundle
if: ${{ matrix.snyk_install_method == 'docker-bundle' }}
if: ${{ matrix.snyk_install_method == 'docker-bundle' && matrix.os == 'macos' }}
run: |
pushd "$(mktemp -d)"
curl 'https://static.snyk.io/cli/latest/${{ matrix.snyk_cli_dl_file }}' | tar -xz
Expand Down Expand Up @@ -145,7 +150,7 @@ jobs:
brew install jq
- name: Install Snyk CLI with homebrew on macOS
if: ${{ matrix.snyk_install_method == 'brew' }}
if: ${{ matrix.snyk_install_method == 'brew' && matrix.os == 'macos'}}
run: |
brew tap snyk/tap
brew install snyk
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit edf268b

Please sign in to comment.