From fe6280fba5f6610c8cf4ff0d5ebecc59df98374e Mon Sep 17 00:00:00 2001 From: Philipp Strube Date: Wed, 21 Apr 2021 17:12:27 +0200 Subject: [PATCH] Fix pipeline to correctly build releases from tags again --- .github/workflows/main.yml | 2 ++ Makefile | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1809a9c5..4d665b95 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,6 +29,8 @@ jobs: - name: 'Build artifacts' env: DOCKER_PUSH: true + GIT_SHA: ${{ github.sha }} + GIT_REF: ${{ github.ref }} run: make dist - name: 'Upload artifacts' diff --git a/Makefile b/Makefile index 1472fd14..7be624cd 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ _all: dist build -GIT_REF := $(shell echo "refs/heads/"`git rev-parse --abbrev-ref HEAD`) -GIT_SHA := $(shell echo `git rev-parse --verify HEAD^{commit}`) +GIT_REF ?= $(shell echo "refs/heads/"`git rev-parse --abbrev-ref HEAD`) +GIT_SHA ?= $(shell echo `git rev-parse --verify HEAD^{commit}`) DOCKER_PUSH ?= false DOCKER_TARGET ?= multi-cloud