Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Post-release 7.0 merge to master #6836

Merged
merged 10 commits into from
Oct 26, 2020
Merged

Post-release 7.0 merge to master #6836

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
158ccd0
cherry-pick recent release process changes to release branch (#6775)
paulb777 Oct 19, 2020
3e8e572
Missing SwiftPM beta annotations (#6777)
paulb777 Oct 19, 2020
12c567b
Fix CI after #6777 (#6780)
paulb777 Oct 20, 2020
9404f28
Fix a memory leak introduced in #6418 (#6778) (#6779)
paulb777 Oct 20, 2020
eb815c6
Add publish option to release tooling (#6792)
paulb777 Oct 21, 2020
0be893d
M82 SPM Analytics update (#6796)
paulb777 Oct 21, 2020
4368b98
Fixed broken callback to AppDelegate (#6800) (#6801)
paulb777 Oct 21, 2020
c887ea1
Update SPM Analytics (#6805)
paulb777 Oct 22, 2020
ab758f2
Speed up retagging (#6806)
paulb777 Oct 22, 2020
5ff6fbe
Merge remote-tracking branch 'origin/release-7.0' into pb-merge7
paulb777 Oct 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ReleaseTooling/Sources/FirebaseReleaser/Tags.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 {
Expand Down