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

fix: Add default workspace to github message marker #3082

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+7 −1
Open

fix: Add default workspace to github message marker #3082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
154a581
fix: Add default workspace to github message marker
ancosma Nov 5, 2023
668b165
Merge branch 'main' into github-unique-marker
nvuillam Nov 26, 2023
c7aed1f
Downgrade stylelint
nvuillam Dec 9, 2023
9d84485
typo
nvuillam Dec 9, 2023
e442858
Merge branch 'fixes/stylelint' into github-unique-marker
nvuillam Dec 9, 2023
18304d7
Merge remote-tracking branch 'origin/main' into github-unique-marker
nvuillam Dec 10, 2023
20879f7
fix changelog
nvuillam Dec 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-linter.yml file, or with `oxsecurity/megalinter:beta` docker image

- Core
- Handle GitHub comment markers for multiple MegaLinter workflows in the same repo

- Media

Expand Down
7 changes: 6 additions & 1 deletion megalinter/reporters/GithubCommentReporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,16 @@ def comment_marker(self):

"""
workflow = os.getenv("GITHUB_WORKFLOW")
github_workspace = os.getenv("GITHUB_WORKSPACE")
workspace = config.get(self.master.request_id, "DEFAULT_WORKSPACE", github_workspace)
if github_workspace is None or workspace == github_workspace:
workspace = None
jobid = os.getenv("GITHUB_JOB")
workflow = workflow and f"workflow={workflow!r}"
jobid = jobid and f"jobid={jobid!r}"
workspace = workspace and f"workspace={workspace!r}"
identifier = " ".join(
["github-comment-reporter", *filter(None, (workflow, jobid))]
["github-comment-reporter", *filter(None, (workflow, jobid, workspace))]
)
return f"<!-- megalinter: {identifier} -->"

Expand Down
Loading