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

Check file conflicts in x86_64 build job #36876

Merged
merged 2 commits into from May 5, 2022

Conversation

Chocimier
Copy link
Member

Report packages installing same file and not marked with conflicts or replaces.

Copy link
Member

@classabbyamp classabbyamp left a 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?

rv=0

template_exists() {
[ -e "srcpkgs/$1/template" ]
Copy link
Member

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)?

Copy link
Member Author

Choose a reason for hiding this comment

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

changed

}

conflicts_of() {
# print list of packages that are _marked_ as confliting with given one
Copy link
Member

Choose a reason for hiding this comment

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

nit/typo: confliting -> conflicting

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed typos

}

list_newly_built_files() {
# print one line per file in newly build packages
Copy link
Member

Choose a reason for hiding this comment

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

nit/typo: build -> built

# create associative array `owners` mapping file to list of packages
# for all packages in xlocate
local pkgname file pkgver
## newly build packages
Copy link
Member

Choose a reason for hiding this comment

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

same nit/typo (built)

@@ -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"
Copy link
Member

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?

Copy link
Member Author

Choose a reason for hiding this comment

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

Right, done.

@Chocimier
Copy link
Member Author

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

@classabbyamp
Copy link
Member

those test runs look good to me, maybe annotations could be added à la #36950 (if they make sense to)?

@0x5c
Copy link
Contributor

0x5c commented May 5, 2022

those test runs look good to me, maybe annotations could be added à la #36950 (if they make sense to)?

As an annotation without the file and line parameters yeah

@Chocimier
Copy link
Member Author

Without file message is not turned into comment elsewhere than logs, I do not see advantage then.

@0x5c
Copy link
Contributor

0x5c commented May 5, 2022

Without file message is not turned into comment elsewhere than logs, I do not see advantage then.

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

@Chocimier Chocimier merged commit e900c63 into void-linux:master May 5, 2022
@Chocimier Chocimier deleted the lint-conflicts branch May 5, 2022 19:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants