diff options
| author | Chris Evich <cevich@redhat.com> | 2021-06-30 11:39:19 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2021-06-30 11:39:19 -0400 |
| commit | 40ef17ac282fab7229a121635f81842fb5d65eb0 (patch) | |
| tree | 8771790b2fadb7b0a47ce9d67c4440426444c6f0 /Makefile | |
| parent | 056f492f59c333d521ebbbe186abde0278e815db (diff) | |
| download | podman-40ef17ac282fab7229a121635f81842fb5d65eb0.tar.gz podman-40ef17ac282fab7229a121635f81842fb5d65eb0.tar.bz2 podman-40ef17ac282fab7229a121635f81842fb5d65eb0.zip | |
Cirrus: Fixes due to master->main rename
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -25,12 +25,12 @@ export GOPROXY=https://proxy.golang.org GO ?= go COVERAGE_PATH ?= .coverage DESTDIR ?= -EPOCH_TEST_COMMIT ?= $(shell git merge-base $${DEST_BRANCH:-master} HEAD) +EPOCH_TEST_COMMIT ?= $(shell git merge-base $${DEST_BRANCH:-main} HEAD) HEAD ?= HEAD CHANGELOG_BASE ?= HEAD~ CHANGELOG_TARGET ?= HEAD PROJECT := github.com/containers/podman -GIT_BASE_BRANCH ?= origin/master +GIT_BASE_BRANCH ?= origin/main GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) GIT_BRANCH_CLEAN ?= $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g") LIBPOD_INSTANCE := libpod_dev |