chore: merge hotfix from rc into stable 1.1292 #5389
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chore: merge stable into rc
A dotnet 8.0.0 vulnerability was discovered on 2024-07-09 which caused dotnet acceptance tests to fail on platforms with the vulnerable version installed. While the toolchain could be updated, the test can be made more robust to future reoccurances of dotnet system vulns. For this test we care more about the operation of the test command rather than its findings, so we can test for consistency between exit code and test output instead. In updating this test, a defect was discovered in the dotnet plugin which corrupts json output. The test works around this, but it will require a dotnet plugin upgrade as a followup to mitigate user impact. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch fix/dotnet-test-fail-20240710 # Changes to be committed: # modified: test/jest/acceptance/snyk-test/basic-test-all-languages.spec.ts # # Untracked files: # distroless-main-jq.json # distroless-main.json # distroless-pr.json # junit.xml # monitor-json-compare.bash # snyk-linux-monitor-main-1.jq.json # snyk-linux-monitor-main-1.json # snyk-linux-monitor-main-2.jq.json # snyk-linux-monitor-main-2.json # snyk-linux-monitor-main.json # snyk-linux-monitor-pr.json # snyk-linux-test-main.json # test.env # test/acceptance/workspaces/swift-app/.build/ # test/acceptance/workspaces/swift/.build/ # test/fixtures/find-files/swift/test.build/.build/ #
…ignored-paths fix: remove ignored paths when discovering npm manifests UNIFY-216
PeterSchafer
changed the title
sandor-trombitas
approved these changes
Jul 31, 2024
PeterSchafer
force-pushed
the
tmp/hotfix-UNIFY-216
branch
from
2d38a83 to
f5a276c
Compare
PeterSchafer
force-pushed
the
tmp/hotfix-UNIFY-216
branch
from
f5a276c to
d76a419
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Submission
Please check the boxes once done.
The pull request must:
feat:orfix:, others might be used in rare occasions as well, if there is no need to document the changes in the release notes. The changes or fixes should be described in detail in the commit message for the changelog & release notes.Pull Request Review
All pull requests must undergo a thorough review process before being merged.
The review process of the code PR should include code review, testing, and any necessary feedback or revisions.
Pull request reviews of functionality developed in other teams only review the given documentation and test reports.
Manual testing will not be performed by the reviewing team, and is the responsibility of the author of the PR.
For Node projects: It’s important to make sure changes in
package.jsonare also affectingpackage-lock.jsoncorrectly.If a dependency is not necessary, don’t add it.
When adding a new package as a dependency, make sure that the change is absolutely necessary. We would like to refrain from adding new dependencies when possible.
Documentation PRs in gitbook are reviewed by Snyk's content team. They will also advise on the best phrasing and structuring if needed.
Pull Request Approval
Once a pull request has been reviewed and all necessary revisions have been made, it is approved for merging into
the main codebase. The merging of the code PR is performed by the code owners, the merging of the documentation PR
by our content writers.
What does this PR do?
Merge hotfix to release
Where should the reviewer start?
How should this be manually tested?
Any background context you want to provide?
What are the relevant tickets?
Screenshots
Additional questions