From aa29bd6de8a9442500f3ea2ac776bc47166f81ea Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 11 Jul 2022 13:17:35 -0400 Subject: Update CI base branch Signed-off-by: Matthew Heon --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 32de58856..eb1c4b581 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ DESTDIR ?= EPOCH_TEST_COMMIT ?= $(shell git merge-base $${DEST_BRANCH:-main} HEAD) HEAD ?= HEAD PROJECT := github.com/containers/podman -GIT_BASE_BRANCH ?= origin/main +GIT_BASE_BRANCH ?= origin/v4.2 LIBPOD_INSTANCE := libpod_dev PREFIX ?= /usr/local BINDIR ?= ${PREFIX}/bin -- cgit v1.2.3-54-g00ecf From 74aa681e59352257eb5f25f089dffa66d6345a3a Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 11 Jul 2022 13:17:57 -0400 Subject: Bump to v4.2.0-rc1 Signed-off-by: Matthew Heon --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 57403b42c..9d359b08e 100644 --- a/version/version.go +++ b/version/version.go @@ -27,7 +27,7 @@ const ( // NOTE: remember to bump the version at the top // of the top-level README.md file when this is // bumped. -var Version = semver.MustParse("4.2.0-dev") +var Version = semver.MustParse("4.2.0-rc1") // See https://docs.docker.com/engine/api/v1.40/ // libpod compat handlers are expected to honor docker API versions -- cgit v1.2.3-54-g00ecf From f22af2bf83e073a87f88d069aa1347c8e93f1521 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 11 Jul 2022 13:18:11 -0400 Subject: Bump to v4.2.0-dev Signed-off-by: Matthew Heon --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 9d359b08e..57403b42c 100644 --- a/version/version.go +++ b/version/version.go @@ -27,7 +27,7 @@ const ( // NOTE: remember to bump the version at the top // of the top-level README.md file when this is // bumped. -var Version = semver.MustParse("4.2.0-rc1") +var Version = semver.MustParse("4.2.0-dev") // See https://docs.docker.com/engine/api/v1.40/ // libpod compat handlers are expected to honor docker API versions -- cgit v1.2.3-54-g00ecf