Skip to content

Commit

Permalink
Merge pull request #5593 from snyk/release-candidate
Browse files Browse the repository at this point in the history
Release 1.1294.1
  • Loading branch information
thisislawatts authored Nov 20, 2024
2 parents d037ebb + 2182e5f commit cd36cab
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 50 deletions.
14 changes: 0 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,6 @@ executors:
- image: snyklabs/cli-build-arm64:20240814-161347
working_directory: /mnt/ramdisk/snyk
resource_class: arm.xlarge
linux-ubuntu-mantic-amd64:
docker:
- image: ubuntu:mantic
working_directory: /mnt/ramdisk/snyk
resource_class: medium
linux-ubuntu-jammy-amd64:
docker:
- image: ubuntu:jammy
Expand All @@ -90,11 +85,6 @@ executors:
- image: ubuntu:latest
working_directory: /mnt/ramdisk/snyk
resource_class: arm.medium
linux-ubuntu-mantic-arm64:
docker:
- image: ubuntu:mantic
working_directory: /mnt/ramdisk/snyk
resource_class: arm.medium
linux-ubuntu-jammy-arm64:
docker:
- image: ubuntu:jammy
Expand Down Expand Up @@ -802,11 +792,9 @@ workflows:
- 'win-server2022-amd64'
- 'macos-arm64'
- 'linux-ubuntu-latest-amd64'
- 'linux-ubuntu-mantic-amd64'
- 'linux-ubuntu-jammy-amd64'
- 'linux-ubuntu-focal-amd64'
- 'linux-ubuntu-latest-arm64'
- 'linux-ubuntu-mantic-arm64'
- 'linux-ubuntu-jammy-arm64'
- 'linux-ubuntu-focal-arm64'
- 'alpine'
Expand Down Expand Up @@ -863,11 +851,9 @@ workflows:
- e2e tests (win-server2022-amd64)
- e2e tests (macos-arm64)
- e2e tests (linux-ubuntu-latest-amd64)
- e2e tests (linux-ubuntu-mantic-amd64)
- e2e tests (linux-ubuntu-jammy-amd64)
- e2e tests (linux-ubuntu-focal-amd64)
- e2e tests (linux-ubuntu-latest-arm64)
- e2e tests (linux-ubuntu-mantic-arm64)
- e2e tests (linux-ubuntu-jammy-arm64)
- e2e tests (linux-ubuntu-focal-arm64)
- e2e tests (alpine)
Expand Down
27 changes: 9 additions & 18 deletions .snyk
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,22 @@
version: v1.25.0
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
ignore:
SNYK-JS-ANSIREGEX-1583908:
- '*':
reason: Not affecting Snyk CLI. No upgrade path currently available
expires: 2022-02-01T00:00:00.000Z
created: 2021-11-29T17:25:19.200Z
SNYK-JS-LODASHSET-1320032:
- '*':
reason: No upgrade path currently available
expires: 2024-09-30T10:00:00.000Z
created: 2023-09-13T13:14:22.120Z
'snyk:lic:npm:shescape:MPL-2.0':
- '*':
reason: --about lists all dependency licenses which is a requirement of MPL-2.0
expires: 2122-12-14T16:35:38.252Z
created: 2022-11-14T16:35:38.260Z
SNYK-JS-BRACES-6838727:
SNYK-JS-CROSSSPAWN-8303230:
- '*':
reason: Direct usage within Snyk CLI are not using vulnerable function
expires: 2024-08-13T04:12:20.523Z
created: 2024-05-14T04:12:20.531Z
SNYK-JS-MICROMATCH-6838728:
reason: No direct upgrade path available
expires: 2025-01-01T00:12:20.523Z
created: 2024-11-08T10:22:20.531Z
SNYK-JS-SOURCEMAPSUPPORT-6112477:
- '*':
reason: Direct usage within Snyk CLI are not using vulnerable function
expires: 2024-10-13T04:12:20.523Z
created: 2024-05-14T04:12:20.531Z
reason: Not directely exploitable
expires: 2025-01-01T00:12:20.523Z
created: 2024-11-08T10:22:20.531Z

patch: {}
exclude:
code:
Expand Down
67 changes: 51 additions & 16 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"semver": "^6.0.0",
"snyk-config": "^5.0.0",
"snyk-cpp-plugin": "2.24.0",
"snyk-docker-plugin": "6.13.2",
"snyk-docker-plugin": "github:snyk/snyk-docker-plugin#v6.13.2-hotfix",
"snyk-go-plugin": "1.23.0",
"snyk-gradle-plugin": "4.6.0",
"snyk-module": "3.1.0",
Expand All @@ -125,7 +125,7 @@
"snyk-nodejs-plugin": "1.3.4",
"snyk-nuget-plugin": "2.7.8",
"snyk-php-plugin": "1.10.0",
"snyk-policy": "^4.0.0",
"snyk-policy": "4.1.4",
"snyk-python-plugin": "2.2.1",
"snyk-resolve-deps": "4.8.0",
"snyk-sbt-plugin": "2.18.1",
Expand Down

0 comments on commit cd36cab

Please sign in to comment.