Skip to content

Commit 7a15bb3

Browse files
Merge branch 'trunk' into add/get-build-number-action
2 parents d9d69c5 + bedfdb1 commit 7a15bb3

File tree

5 files changed

+16
-5
lines changed

5 files changed

+16
-5
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ _None_
2121
### Internal Changes
2222

2323
- Add "Mobile Secrets" to `configure_update` current branch message to clarify which repo it's referring to. [#455]
24+
- `buildkite_trigger_build` now prints the web URL of the newly scheduled build, to allow you to easily open it via cmd-click. [#460]
25+
- Add the branch information to the 'This is not a release branch' error that's thrown from complete code freeze lane. [#461]
26+
- Adds `ignore_pipeline_branch_filters=true` parameter to the API call triggering a Buildkite build [#468]
2427

2528
## 7.0.0
2629

lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_completecodefreeze_prechecks.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def self.run(params)
77
require_relative '../../helper/android/android_version_helper'
88
require_relative '../../helper/android/android_git_helper'
99

10-
UI.user_error!('This is not a release branch. Abort.') unless other_action.git_branch.start_with?('release/')
10+
UI.user_error!("Current branch - '#{other_action.git_branch}' - is not a release branch. Abort.") unless other_action.git_branch.start_with?('release/')
1111

1212
version = Fastlane::Helper::Android::VersionHelper.get_public_version
1313
message = "Completing code freeze for: #{version}\n"

lib/fastlane/plugin/wpmreleasetoolkit/actions/common/buildkite_trigger_build_action.rb

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ def self.run(params)
1313
branch: params[:branch],
1414
commit: params[:commit],
1515
env: params[:environment].merge(pipeline_name),
16-
message: params[:message]
16+
message: params[:message],
17+
# Buildkite will not trigger a build if the GitHub activity for that branch is turned off
18+
# We want API triggers to work regardless of the GitHub activity settings, so this option is necessary
19+
# https://forum.buildkite.community/t/request-build-error-branches-have-been-disabled-for-this-pipeline/1463/2
20+
ignore_pipeline_branch_filters: true
1721
}.compact # remove entries with `nil` values from the Hash, if any
1822

1923
client = Buildkit.new(token: params[:buildkite_token])
@@ -23,7 +27,11 @@ def self.run(params)
2327
options
2428
)
2529

26-
response.state == 'scheduled' ? UI.message('Done!') : UI.crash!("Failed to start job\nError: [#{response}]")
30+
if response.state == 'scheduled'
31+
UI.message("Successfully scheduled new build. You can see it at '#{response.web_url}'")
32+
else
33+
UI.crash!("Failed to start job\nError: [#{response}]")
34+
end
2735
end
2836

2937
#####################################################

lib/fastlane/plugin/wpmreleasetoolkit/actions/common/create_release_action.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def self.run(params)
1616
prerelease = params[:prerelease]
1717
is_draft = params[:is_draft]
1818

19-
UI.message("Creating draft release #{version} in #{repository}.")
19+
UI.message("Creating #{is_draft ? 'draft ' : ''}release #{version} in #{repository}.")
2020
# Verify assets
2121
assets.each do |file_path|
2222
UI.user_error!("Can't find file #{file_path}!") unless File.exist?(file_path)

lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_completecodefreeze_prechecks.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def self.run(params)
77
require_relative '../../helper/ios/ios_version_helper'
88
require_relative '../../helper/ios/ios_git_helper'
99

10-
UI.user_error!('This is not a release branch. Abort.') unless other_action.git_branch.start_with?('release/')
10+
UI.user_error!("Current branch - '#{other_action.git_branch}' - is not a release branch. Abort.") unless other_action.git_branch.start_with?('release/')
1111

1212
version = Fastlane::Helper::Ios::VersionHelper.get_public_version
1313
message = "Completing code freeze for: #{version}\n"

0 commit comments

Comments
 (0)