From d4f4b8f1d8e954a5fe729d92589fc3e6f98377de Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 26 Oct 2020 09:49:56 -0700 Subject: [PATCH] Post-release 7.0 merge to master (#6836) --- ReleaseTooling/Sources/FirebaseReleaser/Tags.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ReleaseTooling/Sources/FirebaseReleaser/Tags.swift b/ReleaseTooling/Sources/FirebaseReleaser/Tags.swift index 94c88a94a38..40006328d3b 100644 --- a/ReleaseTooling/Sources/FirebaseReleaser/Tags.swift +++ b/ReleaseTooling/Sources/FirebaseReleaser/Tags.swift @@ -21,6 +21,9 @@ import Utils enum Tags { static func createTags(gitRoot: URL, deleteExistingTags: Bool = false) { + if deleteExistingTags { + verifyTagsAreSafeToDelete(gitRoot: gitRoot) + } let manifest = FirebaseManifest.shared createTag(gitRoot: gitRoot, tag: "CocoaPods-\(manifest.version)", deleteExistingTags: deleteExistingTags) @@ -45,7 +48,6 @@ enum Tags { private static func createTag(gitRoot: URL, tag: String, deleteExistingTags: Bool) { if deleteExistingTags { - verifyTagsAreSafeToDelete(gitRoot: gitRoot) Shell.executeCommand("git tag --delete \(tag)", workingDir: gitRoot) Shell.executeCommand("git push --delete origin \(tag)", workingDir: gitRoot) } else {