From 222b62e7b0b8b8e5ac69b776d7024c63d620b29b Mon Sep 17 00:00:00 2001 From: Aditya Rajan Date: Wed, 15 Sep 2021 13:30:44 +0530 Subject: vendor: Bump github.com/containers/buildah from 1.22.3 to 1.23.0 [NO TESTS NEEDED] Signed-off-by: Aditya Rajan --- test/buildah-bud/buildah-tests.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/buildah-bud/buildah-tests.diff b/test/buildah-bud/buildah-tests.diff index bb28e11c9..87923484f 100644 --- a/test/buildah-bud/buildah-tests.diff +++ b/test/buildah-bud/buildah-tests.diff @@ -70,7 +70,7 @@ index 166316d5..775d7c9b 100644 + local podman_or_buildah=${BUILDAH_BINARY} + local _opts="${ROOTDIR_OPTS} ${BUILDAH_REGISTRY_OPTS}" -+ if [[ $1 == "bud" || $1 == "build-using-dockerfile" ]]; then ++ if [[ $1 == "build" || $1 == "build-using-dockerfile" ]]; then + shift + # podman defaults to --layers=true; buildah to --false. + # If command line includes explicit --layers, leave it untouched, -- cgit v1.2.3-54-g00ecf From 962675c1482abc3a8458ef060552687a784282a6 Mon Sep 17 00:00:00 2001 From: Aditya Rajan Date: Wed, 15 Sep 2021 15:12:35 +0530 Subject: build.bats: fix copy tests after containers/buildah#3486 Fix copy tests after https://github.com/containers/buildah/pull/3486 [NO TESTS NEEDED] Signed-off-by: Aditya Rajan --- test/system/070-build.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/system/070-build.bats b/test/system/070-build.bats index 47db08eb1..03c7984e2 100644 --- a/test/system/070-build.bats +++ b/test/system/070-build.bats @@ -464,7 +464,7 @@ Labels.$label_name | $label_value local -a files=( -test1 -test1.txt test2 test2.txt - subdir/sub1 subdir/sub1.txt + -subdir/sub1 -subdir/sub1.txt -subdir/sub2 -subdir/sub2.txt this-file-does-not-match-anything-in-ignore-file comment -- cgit v1.2.3-54-g00ecf