From ed21c8640d53185fe540cd1caf295edb40c31bdc Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 15 Mar 2022 17:33:34 +0100 Subject: [PATCH 1/2] Fix windows win-sshproxy build Github no longer supports the unauthenticated git protocol, so switch to using https instead. https://github.blog/2021-09-01-improving-git-protocol-security-github/ Signed-off-by: Paul Holzinger --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cb230d8e9f..7f7271bd6d 100644 --- a/Makefile +++ b/Makefile @@ -191,7 +191,7 @@ endif # dependencies. This is only used for the Windows installer task (podman.msi), which must # include this lightweight helper binary. # -GV_GITURL=git://github.com/containers/gvisor-tap-vsock.git +GV_GITURL=https://github.com/containers/gvisor-tap-vsock.git GV_SHA=e943b1806d94d387c4c38d96719432d50a84bbd0 ### From 9a7c9ddffb3ea9575ec68cd0f0a53d34c22ae65b Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 17 Mar 2022 14:32:27 -0400 Subject: [PATCH 2/2] Cirrus: Update base branch to v4.0-rhel Signed-off-by: Chris Evich --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index f1730644d5..081b1e5559 100644 --- 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: "v4.0" + DEST_BRANCH: "v4.0-rhel" # Netavark branch to use when TEST_ENVIRON=host-netavark NETAVARK_BRANCH: "main" # TODO: This should point to a release branch # Aardvark branch to use