From 9326dec39bd74b7425370a2a0159f5b457e253fe 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. (cherry picked from commit 531bc515ae92ee8bbfa30271db0baa4ec0085f39) --- .drone.yml | 6 +++--- dronegen/common.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 17c7994c5db7a..6c6f0a4990697 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6024,7 +6024,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 @@ -6166,7 +6166,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 @@ -7085,6 +7085,6 @@ steps: WORKSPACE_DIR: /tmp/build-darwin-amd64-connect --- kind: signature -hmac: 988f4696f1925ee441a15113f5660e8906bec7c3618126a47e69228fde7b8666 +hmac: bec18a0a480759e7187aee70e923cc41243841e22b690466946a66b480749494 ... diff --git a/dronegen/common.go b/dronegen/common.go index b42e39135e94a..a23fde3139941 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), } }