From 120522ba6e3b3253f9249cda4d23665454f6b86c Mon Sep 17 00:00:00 2001 From: Finn Date: Wed, 3 Feb 2021 00:15:33 -0800 Subject: [PATCH] ugh idk --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9709578..9e4aced 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,8 +37,9 @@ build:cross-compile: - mkdir -p /go/src/gitlab.com/signald/signald-go - cp -r * /go/src/gitlab.com/signald/signald-go script: + - git checkout "${CI_COMMIT_BRANCH}" - git pull --tags - - VERSION="$(git describe --abbrev=0)-$(git rev-list $(git describe --abbrev=0)..HEAD --count)-$(git rev-parse --short=8 HEAD)" + - VERSION="$(git describe --abbrev=0 HEAD)-$(git rev-list $(git describe --abbrev=0 HEAD)..HEAD --count)-$(git rev-parse --short=8 HEAD)" - cd /go/src/gitlab.com/signald/signald-go - go build -o "${CI_PROJECT_DIR}/signaldctl-${GOOS}-${GOARCH}" --ldflags "-X gitlab.com/signald/signald-go/cmd/signaldctl/common.Version=${VERSION} -X gitlab.com/signald/signald-go/cmd/signaldctl/common.Branch=${CI_COMMIT_BRANCH} -X gitlab.com/signald/signald-go/cmd/signaldctl/common.Commit=${CI_COMMIT_SHA}" ./cmd/signaldctl artifacts: