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.

Sign up for GitHub

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

Jump to bottom

docs: only display main status for Snyk badge #13320

Merged
merged 2 commits into from
Jul 8, 2024
Merged

docs: only display main status for Snyk badge #13320

merged 2 commits into from
Jul 8, 2024

Conversation

agilgur5
Copy link
Member

@agilgur5 agilgur5 commented Jul 7, 2024 •
edited
Loading

Motivation

  • the link went to main, but the query for the badge did not
  • this should only show main, and then for release branches show the release branch
    • this will need manual backporting as such (np, I can do that)

Modifications

  • add a branch query to the SVG

Verification

@agilgur5
docs: only display main status for Snyk badge
09dd9e6 
- the link went to `main`, but the query for the badge did not
- this should only show `main`, and then for release branches show the release branch
  - this will need manual backporting as such (np, I can do that)

Signed-off-by: Anton Gilgur <[email protected]>
@agilgur5 agilgur5 added type/security Security related area/docs Incorrect, missing, or mistakes in docs labels Jul 7, 2024
@agilgur5 agilgur5 added this to the v3.4.x patches milestone Jul 7, 2024
Joibel
Joibel approved these changes Jul 8, 2024
View reviewed changes
Copy link
Member

@Joibel Joibel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, this makes sense. Thanks.

@Joibel Joibel merged commit 1a81dfb into argoproj:main Jul 8, 2024
18 checks passed
@agilgur5 agilgur5 deleted the docs-snyk-main-branch-only branch July 8, 2024 17:51
agilgur5 added a commit that referenced this pull request Jul 10, 2024
@agilgur5
docs: only display release-3.5 status for Snyk badge (#13320)
9f55687 
- modified backport to use `release-3.5` instead of `main`

Signed-off-by: Anton Gilgur <[email protected]>
(cherry picked from commit 1a81dfb)
@agilgur5
Copy link
Member Author

this will need manual backporting as such (np, I can do that)

Backported with modifications to release-3.5 as 9f55687.

I actually couldn't cherry-pick it into release-3.4 as it had a merge conflict because the docs are older. Might eventually be able to get the docs up-to-date if there aren't too many conflicts (I made some progress on that, but it's pretty far behind)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Joibel Joibel Joibel approved these changes

@terrytangyuan terrytangyuan Awaiting requested review from terrytangyuan

Assignees
No one assigned
Labels
area/docs Incorrect, missing, or mistakes in docs type/security Security related
Projects
None yet
Milestone
v3.5.x patches
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@agilgur5 @Joibel