Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source 'https://rubygems.org'

gem 'fastlane', '~> 2.232'
gem 'fastlane-plugin-wpmreleasetoolkit', '~> 14.1'
gem 'fastlane-plugin-wpmreleasetoolkit', '~> 14.2'

gem 'aws-sdk-cloudfront', '~> 1.87'

Expand Down
36 changes: 18 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,29 @@ GEM
specs:
CFPropertyList (3.0.8)
abbrev (0.1.2)
activesupport (8.1.2)
activesupport (7.2.3)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
json
logger (>= 1.4.2)
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.8.8)
addressable (2.8.9)
public_suffix (>= 2.0.2, < 8.0)
artifactory (3.0.17)
ast (2.4.3)
atomos (0.1.3)
aws-eventstream (1.4.0)
aws-partitions (1.1218.0)
aws-partitions (1.1223.0)
aws-sdk-cloudfront (1.141.0)
aws-sdk-core (~> 3, >= 3.241.4)
aws-sigv4 (~> 1.5)
aws-sdk-core (3.242.0)
aws-sdk-core (3.243.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
Expand All @@ -37,8 +36,8 @@ GEM
aws-sdk-kms (1.122.0)
aws-sdk-core (~> 3, >= 3.241.4)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.213.0)
aws-sdk-core (~> 3, >= 3.241.4)
aws-sdk-s3 (1.215.0)
aws-sdk-core (~> 3, >= 3.243.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.12.1)
Expand Down Expand Up @@ -97,7 +96,7 @@ GEM
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.4.0)
fastlane (2.232.1)
fastlane (2.232.2)
CFPropertyList (>= 2.3, < 4.0.0)
abbrev (~> 0.1.2)
addressable (>= 2.8, < 3.0.0)
Expand Down Expand Up @@ -147,8 +146,8 @@ GEM
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.4.1)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
fastlane-plugin-wpmreleasetoolkit (14.1.0)
activesupport (>= 6.1.7.1)
fastlane-plugin-wpmreleasetoolkit (14.2.0)
activesupport (>= 6.1.7.1, < 8)
buildkit (~> 1.5)
chroma (= 0.2.0)
diffy (~> 3.3)
Expand All @@ -167,8 +166,9 @@ GEM
xcodeproj (~> 1.22)
fastlane-sirp (1.0.0)
sysrandom (~> 1.0)
fiddle (1.1.8)
forwardable (1.4.0)
gettext (3.5.1)
gettext (3.5.2)
erubi
locale (>= 2.0.5)
prime
Expand Down Expand Up @@ -225,12 +225,13 @@ GEM
concurrent-ruby (~> 1.0)
java-properties (0.3.0)
jmespath (1.6.2)
json (2.18.1)
json (2.19.1)
jwt (2.10.2)
base64
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
locale (2.1.4)
locale (2.1.5)
fiddle
logger (1.7.0)
mini_magick (4.13.2)
mini_mime (1.1.5)
Expand Down Expand Up @@ -279,7 +280,7 @@ GEM
progress_bar (1.3.4)
highline (>= 1.6)
options (~> 2.3.0)
public_suffix (7.0.2)
public_suffix (7.0.5)
racc (1.8.1)
rainbow (3.1.1)
rake (13.3.1)
Expand All @@ -291,7 +292,7 @@ GEM
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.2.1)
retriable (3.4.0)
rexml (3.4.4)
rouge (3.28.0)
rubocop (1.84.1)
Expand Down Expand Up @@ -339,7 +340,6 @@ GEM
concurrent-ruby (~> 1.0)
uber (0.1.0)
unicode-display_width (2.6.0)
uri (1.1.1)
word_wrap (1.0.0)
xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
Expand All @@ -366,7 +366,7 @@ PLATFORMS
DEPENDENCIES
aws-sdk-cloudfront (~> 1.87)
fastlane (~> 2.232)
fastlane-plugin-wpmreleasetoolkit (~> 14.1)
fastlane-plugin-wpmreleasetoolkit (~> 14.2)
openssl
rubocop (~> 1.42)

Expand Down
12 changes: 10 additions & 2 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ lane :publish_release do |version:, skip_confirm: false, github_username: nil|
# Publish the draft GitHub release
publish_github_release(
repository: GITHUB_REPO,
name: "v#{version}"
name: github_release_name(version:)
)

create_backmerge_pr(source_branch: release_branch, github_username: github_username)
Expand Down Expand Up @@ -646,6 +646,12 @@ end
# Release Management Helper Methods
########################################################################

# Format the human-readable GitHub release name from a version string.
# The git tag remains as "vX.Y.Z", but the release title uses this format.
def github_release_name(version:)
"Version #{version}"
end

# Bump version in package.json, commit, and push.
# Used by new_beta_release, finalize_release, and new_hotfix_release.
def bump_version_commit_and_push(version:, set_upstream: false)
Expand Down Expand Up @@ -762,21 +768,23 @@ def create_draft_github_release(version:, release_tag:, builds:)
'The latest version is always available on the [WordPress Studio](https://developer.wordpress.com/studio/) site.'
end

release_name = github_release_name(version:)
release_notes_path = File.join(PROJECT_ROOT_FOLDER, 'fastlane', 'github_release_notes.txt')
File.write(release_notes_path, body)

base_version = version.sub(/-beta\d+$/, '')
create_github_release(
repository: GITHUB_REPO,
version: release_tag,
name: release_name,
target: "release/#{base_version}",
release_notes_file_path: release_notes_path,
release_assets: [],
prerelease: false,
is_draft: true
)

UI.success("Created draft GitHub release #{release_tag} with download links")
UI.success("Created draft GitHub release '#{release_name}' with download links")
end

# Trigger a release build in Buildkite for the given version.
Expand Down