opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-17 06:59:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Buildah treadmill tweaks

Browse Source 
* treadmill script: handle an obscure corner case
  wherein the script would bail because it thought
  there were no buildah-vendor changes.

* two new test skips

* update the diffs; line-number changes due to buildah
  PRs touching helpers.bash

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2024-05-21 05:02:49 -06:00
parent b5d953e23c
commit 33398ebc1e
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hack/buildah-vendor-treadmill
View File

@ -928,7 +928,12 @@ sub assert_buildah_vendor_commit {
}
if (! grep { m!^vendor/\Q$Buildah\E/! } @deltas) {
push @missing, "no changes under $Buildah";
# There's an infrequent corner case: changes in buildah are only in
# the tests and/or vendor dirs, which are not checked out in our tree.
my @go_mod_diffs = git('diff', '-U0', "$ref^", "$ref", "--", "go.mod");
if (! grep { /^[-+]\s+$Buildah\s/ } @go_mod_diffs) {
push @missing, "no changes under $Buildah";
}
}
return if !@missing;