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

ci(update): make it possible to pass additional options to osv-scanner (backport of #9940) #9943

Merged
merged 2 commits into from
Apr 16, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Apr 15, 2024

Automatic cherry-pick of #9940 for branch release-2.3

Generated by action

cherry-picked commit fc8b2e9
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.3
Your branch is up to date with 'origin/release-2.3'.

You are currently cherry-picking commit fc8b2e9b4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   tools/ci/update-vulnerable-dependencies/update-vulnerable-dependencies.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/update-insecure-dependencies.yaml

@slonka slonka added the ci/skip-test PR: Don't run unit and e2e tests (maybe this is just a doc change) label Apr 15, 2024
@slonka slonka removed the conflict label Apr 15, 2024
@slonka slonka merged commit d5ca64a into release-2.3 Apr 16, 2024
4 checks passed
@slonka slonka deleted the chore/backport-release-2.3-9940 branch April 16, 2024 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci/skip-test PR: Don't run unit and e2e tests (maybe this is just a doc change) release-2.3
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants