pull after checkout

This commit is contained in:
Finn 2021-07-09 18:57:38 -07:00
parent 15e3bd7298
commit 7ed5558491

View file

@ -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}" || true
- (git checkout "${CI_COMMIT_BRANCH}" && git pull)|| 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
@ -40,7 +40,7 @@ lint:
- apt-get update
- apt-get install -y git-buildpackage dh-golang bash-completion golang-any golang-github-spf13-cobra-dev golang-github-spf13-viper-dev
- apt-get install -y ./*.deb && rm -vf *.deb
- git checkout "${CI_COMMIT_BRANCH}" || true
- (git checkout "${CI_COMMIT_BRANCH}" && git pull)|| true
- go run ./cmd/signaldctl doc -o man
- go run ./cmd/signaldctl completion bash > debian/package.bash-completion
- ls *.1 > debian/manpages
@ -83,7 +83,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}" || true
- (git checkout "${CI_COMMIT_BRANCH}" && git pull)|| 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