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
Check file conflicts in x86_64 build job #36876
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
seems pretty good to me. feel free to ignore the nitpicks if you wish.
Do you have an example of the output somewhere?
common/scripts/lint-conflicts
Outdated
rv=0 | ||
|
||
template_exists() { | ||
[ -e "srcpkgs/$1/template" ] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shouldn't this be -f
(exists and is file)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
changed
common/scripts/lint-conflicts
Outdated
} | ||
|
||
conflicts_of() { | ||
# print list of packages that are _marked_ as confliting with given one |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit/typo: confliting
-> conflicting
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed typos
common/scripts/lint-conflicts
Outdated
} | ||
|
||
list_newly_built_files() { | ||
# print one line per file in newly build packages |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit/typo: build
-> built
common/scripts/lint-conflicts
Outdated
# create associative array `owners` mapping file to list of packages | ||
# for all packages in xlocate | ||
local pkgname file pkgver | ||
## newly build packages |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same nit/typo (built)
common/travis/fetch-xtools.sh
Outdated
@@ -4,7 +4,7 @@ | |||
|
|||
TAR=tar | |||
command -v bsdtar >/dev/null && TAR=bsdtar | |||
URL="https://github.com/leahneukirchen/xtools/archive/master.tar.gz" | |||
URL="https://github.com/Chocimier/xtools/archive/master.tar.gz" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this can be switched back now, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, done.
Changed usage so it takes list of packages from local repository index and not global file. Can be easily used locally without arguments. Test runs at https://github.com/Chocimier/void-packages-org/actions/runs/2272244355, https://github.com/Chocimier/void-packages-org/actions/runs/2272208791, https://github.com/Chocimier/void-packages-org/actions/runs/2272194034 |
those test runs look good to me, maybe annotations could be added à la #36950 (if they make sense to)? |
As an annotation without the |
Without |
It gets a special mention in the action run summary page, and arguably the special highlighting in the logs is worth it. The message in the logs could otherwise be printed in red with ANSI sequences since GH actions render those |
Report packages installing same file and not marked with conflicts or replaces.