Skip to content

Commit

Permalink
Apply suggestions from code review from similar PRs
Browse files Browse the repository at this point in the history
  • Loading branch information
iangmaia committed Sep 4, 2024
1 parent 7b5e1e7 commit 4a10dc3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
3 changes: 0 additions & 3 deletions .buildkite/release-pipelines/publish-release.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
agents:
queue: "android"

steps:
- label: "Publish Release"
plugins:
Expand Down
7 changes: 5 additions & 2 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,9 @@ platform :ios do

create_backmerge_pr

# Now that an eventual backmerge PR has created an intermediate branch, we can delete the `release/*` branch
# At this point, an intermediate branch has been created by creating a backmerge PR to a hotfix or the next version release branch.
# This allows us to safely delete the `release/*` branch.
# Note that if a hotfix or new release branches haven't been created, the backmerge PR won't be created as well.
delete_remote_git_branch!(current_branch)
end

Expand Down Expand Up @@ -1491,6 +1493,7 @@ def create_backmerge_pr
rescue StandardError => e
error_message = <<-MESSAGE
Error creating backmerge pull request:
```
#{e.message}
```
Expand Down Expand Up @@ -1525,7 +1528,7 @@ end
def delete_remote_git_branch!(branch_name)
remove_branch_protection(repository: GITHUB_REPO, branch: branch_name)

Git.open('.').push('origin', branch_name, delete: true)
Git.open(Dir.pwd).push('origin', branch_name, delete: true)
end

def report_milestone_error(error_title:)
Expand Down

0 comments on commit 4a10dc3

Please sign in to comment.