@@ -45,9 +45,10 @@ REV=$(shell git describe --long --tags --match='v*' --dirty 2>/dev/null || git r
4545# Determined dynamically.
4646IMAGE_TAGS =
4747
48- # A "canary" image gets built if the current commit is the head of the remote "master" branch.
48+ # A "canary" image gets built if the current commit is the head of the remote "master" or "main" branch.
4949# That branch does not exist when building some other branch in TravisCI.
5050IMAGE_TAGS+ =$(shell if [ "$$(git rev-list -n1 HEAD ) " = "$$(git rev-list -n1 origin/master 2>/dev/null ) " ]; then echo "canary"; fi)
51+ IMAGE_TAGS+ =$(shell if [ "$$(git rev-list -n1 HEAD ) " = "$$(git rev-list -n1 origin/main 2>/dev/null ) " ]; then echo "canary"; fi)
5152
5253# A "X.Y.Z-canary" image gets built if the current commit is the head of a "origin/release-X.Y.Z" branch.
5354# The actual suffix does not matter, only the "release-" prefix is checked.
@@ -143,7 +144,7 @@ DOCKER_BUILDX_CREATE_ARGS ?=
143144# Windows binaries can be built before adding a Dockerfile for it.
144145#
145146# BUILD_PLATFORMS determines which individual images are included in the multiarch image.
146- # PULL_BASE_REF must be set to 'master', 'release-x.y', or a tag name, and determines
147+ # PULL_BASE_REF must be set to 'master', 'main', ' release-x.y', or a tag name, and determines
147148# the tag for the resulting multiarch image.
148149$(CMDS:% =push-multiarch-%): push-multiarch-%: check-pull-base-ref build-%
149150 set -ex; \
@@ -191,7 +192,7 @@ $(CMDS:%=push-multiarch-%): push-multiarch-%: check-pull-base-ref build-%
191192 done; \
192193 docker manifest push -p $(IMAGE_NAME):$$tag; \
193194 }; \
194- if [ $(PULL_BASE_REF) = "master" ]; then \
195+ if [ $(PULL_BASE_REF) = "master" ] || [ $(PULL_BASE_REF) = "main" ] ; then \
195196 : "creating or overwriting canary image"; \
196197 pushMultiArch canary; \
197198 elif echo $(PULL_BASE_REF) | grep -q -e 'release-*' ; then \
@@ -209,7 +210,7 @@ $(CMDS:%=push-multiarch-%): push-multiarch-%: check-pull-base-ref build-%
209210.PHONY : check-pull-base-ref
210211check-pull-base-ref :
211212 if ! [ " $( PULL_BASE_REF) " ]; then \
212- echo >&2 " ERROR: PULL_BASE_REF must be set to 'master', 'release-x.y', or a tag name." ; \
213+ echo >&2 " ERROR: PULL_BASE_REF must be set to 'master', 'main', ' release-x.y', or a tag name." ; \
213214 exit 1; \
214215 fi
215216
0 commit comments