ci: fix

.ci/envsh.common

@@ -37,19 +37,24 @@ image_tag_norm() {
 ## misc CI things
 # CI_COMMIT_SHORT_SHA="${CI_COMMIT_SHA:0:8}"
 CI_COMMIT_SHORT_SHA=$(printf '%s' "${CI_COMMIT_SHA}" | cut -c 1-8)
-CI_COMMIT_REF_SLUG="$(ref_slug "${CI_COMMIT_BRANCH}")"
+if [ -n "${CI_COMMIT_BRANCH}" ] ; then
+    CI_COMMIT_REF_SLUG="$(ref_slug "${CI_COMMIT_BRANCH}")"
+fi
 if [ -n "${CI_COMMIT_SOURCE_BRANCH}" ] ; then
     CI_COMMIT_REF_SLUG="$(ref_slug "${CI_COMMIT_SOURCE_BRANCH}")"
 fi
+if [ -n "${CI_COMMIT_TAG}" ] ; then
+    CI_COMMIT_REF_SLUG="$(ref_slug "${CI_COMMIT_TAG}")"
+fi
 
 ## image tag(s)
 IMAGE_TAG="${CI_COMMIT_SHORT_SHA}-b${CI_PIPELINE_NUMBER}-${CI_COMMIT_REF_SLUG}"
 EXTRA_TAGS=$(image_tag_norm "branch-${CI_COMMIT_BRANCH}")
 if [ -n "${CI_COMMIT_TAG}" ] ; then
-    IMAGE_TAG="${CI_COMMIT_TAG}"
-    unset EXTRA_TAGS
+    IMAGE_TAG="${CI_COMMIT_SHORT_SHA}"
+    EXTRA_TAGS="${CI_COMMIT_REF_SLUG}"
     ## TODO: think about "latest" tag: it should be error-prone for "backward tag push"
-    # EXTRA_TAGS='latest'
+    # EXTRA_TAGS="${CI_COMMIT_REF_SLUG} latest"
 else
     if [ -n "${CI_COMMIT_SOURCE_BRANCH}" ] ; then
         echo "Running on branch '${CI_COMMIT_SOURCE_BRANCH}'"

.ci/sync-all.sh

@@ -24,15 +24,18 @@ while : ; do
     skopeo copy --all "${image_src}:${IMAGE_TAG}" "${image_interim}" || r=$?
     [ "$r" = 0 ] || break
 
+    echo " -> ${image_dst}:${IMAGE_TAG}"
     skopeo copy --all "${image_interim}" "${image_dst}:${IMAGE_TAG}" || r=$?
     [ "$r" = 0 ] || break
 
     for tag in ${EXTRA_TAGS} ; do
         [ -n "${tag}" ] || continue
 
+        echo " -> ${image_src}:${tag}"
         skopeo copy --all "${image_interim}" "${image_src}:${tag}" || r=$?
         [ "$r" = 0 ] || break
 
+        echo " -> ${image_dst}:${tag}"
         skopeo copy --all "${image_interim}" "${image_dst}:${tag}" || r=$?
         [ "$r" = 0 ] || break
     done

.dockerignore

@@ -4,4 +4,3 @@ publish-nexus*
 .ci/*
 .woodpecker/*
 .woodpecker.yml
-dist/*

Makefile

@@ -46,6 +46,9 @@ $(OUTBIN):
 	    echo "!!! git information is asbent !!!" >&2 ; \
 	    GO_BUILDFLAGS="-buildvcs=false $${GO_BUILDFLAGS}" ; \
 	fi ; \
+	for i in $$(seq 1 3) ; do \
+	    if $(GO) get ; then break ; fi ; \
+	done ; \
 	$(GO) build -o $@ \
 	  $${GO_BUILDFLAGS} \
 	  $(if $(strip $(TAGS)),-tags '$(strip $(TAGS))') \