From 460fef2f0e4f82b10c683878b000d71242d7b148 Mon Sep 17 00:00:00 2001 From: Finn Date: Fri, 9 Jul 2021 00:39:24 -0700 Subject: [PATCH] Possibly fix building in a branch --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a8036c..5c28a21 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ lint: - 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 checkout "${CI_COMMIT_BRANCH}" || true - VERSION="$(git describe --abbrev=0 HEAD)-$(git rev-list $(git describe --abbrev=0 HEAD)..HEAD --count)-$(git rev-parse --short=8 HEAD)" - echo "building ${VERSION}" - cd /go/src/gitlab.com/signald/signald-go @@ -52,7 +52,7 @@ 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 checkout "${CI_COMMIT_BRANCH}" || true - VERSION="$(git describe --abbrev=0 HEAD)-$(git rev-list $(git describe --abbrev=0 HEAD)..HEAD --count)-$(git rev-parse --short=8 HEAD)" - echo "building ${VERSION}" - cd /go/src/gitlab.com/signald/signald-go @@ -80,7 +80,7 @@ build:x86:deb: - apt-get install -y ./*.deb && rm -vf *.deb - "sed -i 's/^Architecture:.*/Architecture: amd64/g' debian/control" script: - - git checkout "${CI_COMMIT_BRANCH}" + - git checkout "${CI_COMMIT_BRANCH}" || true - go run ./cmd/signaldctl doc -o man - go run ./cmd/signaldctl completion bash > debian/package.bash-completion - ls *.1 > debian/manpages @@ -114,7 +114,7 @@ build:aarch64:deb: - apt-get install -y ./*.deb && rm -vf *.deb - "sed -i 's/^Architecture:.*/Architecture: arm64/g' debian/control" script: - - git checkout "${CI_COMMIT_BRANCH}" + - git checkout "${CI_COMMIT_BRANCH}" || true - go run ./cmd/signaldctl doc -o man - go run ./cmd/signaldctl completion bash > debian/package.bash-completion - ls *.1 > debian/manpages