Post-release 7.0 merge to master (#6836)

firebase · Oct 29, 2020 · d4f4b8f · d4f4b8f
1 parent bc9d3aa
commit d4f4b8f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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 {