Merge pull request #3447 from nalind/release-1.22-post

[release-1.22] post-branch commit
containers · Aug 12, 2021 · 98960f2 · 98960f2
2 parents 71b8003 + 357ccce
commit 98960f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -6,7 +6,7 @@ env:
     #### Global variables used for all tasks
     ####
     # Name of the ultimate destination branch for this CI run, PR or post-merge.
-    DEST_BRANCH: "main"
+    DEST_BRANCH: "release-1.22"
     GOPATH: "/var/tmp/go"
     GOSRC: "${GOPATH}/src/github.com/containers/buildah"
     # Overrides default location (/tmp/cirrus) for repo clone

diff --git a/tests/validate/git-validation.sh b/tests/validate/git-validation.sh
@@ -11,7 +11,7 @@ if [[ -z "$(type -P git-validation)" ]]; then
 	exit 1
 fi
 
-GITVALIDATE_EPOCH="${GITVALIDATE_EPOCH:-1f8bf4dba27d9a157f966dad3a1e0f58091091d8}"
+GITVALIDATE_EPOCH="${GITVALIDATE_EPOCH:-e6ea308d6de1724a0ead3e08517a5e365461b275}"
 
 OUTPUT_OPTIONS="-q"
 if [[ "$CI" == 'true' ]]; then