containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vendor treadmill script: run 'git add vendor' 

Situation encountered just now after buildah #3949 but
before podman #14084: go.mod changed in such a way that
other modules were updated, not just buildah, and those
changes weren't git-added by 'make vendor'. This resulted
in the dirty-tree CI test failing.

Solution: check for untracked vendor files after 'make vendor',
and git-add them. Show a friendly message that we're doing so:

    +---> Adding untracked files under containers/image, containers/storage, klauspost/compress, x/sys

In order to do this safely, we run an untracked-files check
under vendor as one of the first sanity checks. If there are
any when we start the script, fail early.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago 2022-05-03 06:53:36 -06:00
parent 3ac5cec086
commit 5fac879ea4
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hack/buildah-vendor-treadmill
View File

@ -235,7 +235,21 @@ END_FAIL_INSTRUCTIONS
# Tweak .cirrus.yml so we run bud tests first in CI (to fail fast). # Tweak .cirrus.yml so we run bud tests first in CI (to fail fast).
tweak_cirrus_test_order(); tweak_cirrus_test_order();
# FIXME: check if 'make vendor' brought in new (untracked) files? # 'make vendor' seems to git-add files under buildah itself, but not
# under other changed modules. Add those now, otherwise we fail
# the dirty-tree test in CI.
if (my @v = git('status', '--porcelain', '--untracked=all', 'vendor')) {
if (my @untracked = grep { /^\?\?\s/ } @v) {
my %repos = map {
s!^.*?vendor/[^/]+/([^/]+/[^/]+)/.*$!$1!; $_ => 1;
} @untracked;
my $repos = join(', ', sort keys %repos);
progress("Adding untracked files under $repos");
git('add', 'vendor');
}
}
# Commit everything.
git('commit', '-as', '-m', <<"END_COMMIT_MESSAGE"); git('commit', '-as', '-m', <<"END_COMMIT_MESSAGE");
[DO NOT MERGE] vendor in buildah \@ $buildah_new [DO NOT MERGE] vendor in buildah \@ $buildah_new
@ -654,12 +668,18 @@ END_WARN
} }
# OK so far. Now check for modified files. # OK so far. Now check for modified files.
my @changed = git('status', '--porcelain', '--untracked=no') if (my @changed = git('status', '--porcelain', '--untracked=no')) {
or return; warn "$ME: Modified files in repo:\n";
warn " $_\n" for @changed;
exit 1;
}
warn "$ME: Modified files in repo:\n"; # ...and for untracked files under vendor/
warn " $_\n" for @changed; if (my @v = git('status', '--porcelain', '--untracked=all', 'vendor')) {
exit 1; warn "$ME: Untracked vendor files:\n";
warn " $_\n" for @v;
exit 1;
}
} }
######################## ########################