From 531bc515ae92ee8bbfa30271db0baa4ec0085f39 Mon Sep 17 00:00:00 2001 From: Walt Della Date: Tue, 4 Oct 2022 09:18:01 -0700 Subject: [PATCH] Fetch tags when promoting rpm/deb Without this any tag that isn't part of the history on master will fail to successfully promote. This breaks most dev builds, which don't end up as part of master or a release branch. --- .drone.yml | 6 +++--- dronegen/common.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index da4384c9f2f..5ee56fc95b6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6107,7 +6107,7 @@ steps: - mkdir -pv "/go/src/github.com/gravitational/teleport" - cd "/go/src/github.com/gravitational/teleport" - git init && git remote add origin ${DRONE_REMOTE_URL} - - git fetch origin + - git fetch origin --tags - git checkout -qf "${DRONE_TAG}" depends_on: - Verify build is tagged @@ -6249,7 +6249,7 @@ steps: - mkdir -pv "/go/src/github.com/gravitational/teleport" - cd "/go/src/github.com/gravitational/teleport" - git init && git remote add origin ${DRONE_REMOTE_URL} - - git fetch origin + - git fetch origin --tags - git checkout -qf "${DRONE_TAG}" depends_on: - Verify build is tagged @@ -7212,6 +7212,6 @@ steps: WORKSPACE_DIR: /tmp/build-darwin-amd64-connect --- kind: signature -hmac: 998e75dfe42adc26bf6ff61dc6fec6bd5f87b5c2de3de952b061192d87e40893 +hmac: 65e2f6af8da82eac69c036051504edb6a9e175e2175bfe4ac40631c6dbf58a79 ... diff --git a/dronegen/common.go b/dronegen/common.go index b42e39135e9..a23fde31399 100644 --- a/dronegen/common.go +++ b/dronegen/common.go @@ -102,7 +102,7 @@ func cloneRepoCommands(cloneDirectory, commit string) []string { fmt.Sprintf("mkdir -pv %q", cloneDirectory), fmt.Sprintf("cd %q", cloneDirectory), `git init && git remote add origin ${DRONE_REMOTE_URL}`, - `git fetch origin`, + `git fetch origin --tags`, fmt.Sprintf("git checkout -qf %q", commit), } }