Skip to content

Fix release notes version bump using next_version param #5185

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

Merged
mokagio merged 3 commits into from
Mar 31, 2026
+45 −21
Merged

Fix release notes version bump using next_version param #5185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e7ef9c
Use `next_version` param for release notes update
iangmaia Mar 30, 2026
fae2129
Add comments clarifying version variables in code_freeze
iangmaia Mar 30, 2026
294aba1
Bump release-toolkit to ~> 14.3
mokagio Mar 31, 2026
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem 'danger-dangermattic', '~> 1.2.1'
gem 'fastlane', '~> 2.226'
gem 'fastlane-plugin-firebase_app_distribution', '~> 0.10'

gem 'fastlane-plugin-wpmreleasetoolkit', '~> 13.8'
gem 'fastlane-plugin-wpmreleasetoolkit', '~> 14.3'
# These lines are kept to help with testing Release Toolkit changes
# gem 'fastlane-plugin-wpmreleasetoolkit', path: '../../release-toolkit'
# gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', branch: ''
Expand Down
57 changes: 39 additions & 18 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@ GEM
specs:
CFPropertyList (3.0.8)
abbrev (0.1.2)
activesupport (8.1.2.1)
activesupport (7.2.3.1)
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)
minitest (>= 5.1, < 6)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.8.8)
public_suffix (>= 2.0.2, < 8.0)
artifactory (3.0.17)
Expand All @@ -41,7 +40,8 @@ GEM
aws-sigv4 (1.12.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.3.0)
base64 (0.2.0)
benchmark (0.5.0)
bigdecimal (4.0.1)
buildkit (1.6.1)
sawyer (>= 0.6)
Expand Down Expand Up @@ -92,6 +92,7 @@ GEM
dotenv (2.8.1)
drb (2.2.3)
emoji_regex (3.2.3)
erubi (1.13.1)
excon (0.112.0)
faraday (1.10.5)
faraday-em_http (~> 1.0)
Expand Down Expand Up @@ -124,14 +125,16 @@ GEM
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.4.0)
fastlane (2.229.0)
fastlane (2.232.2)
CFPropertyList (>= 2.3, < 4.0.0)
abbrev (~> 0.1.2)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.0)
aws-sdk-s3 (~> 1.197)
babosa (>= 1.0.3, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
base64 (~> 0.2.0)
benchmark (>= 0.1.0)
bundler (>= 1.17.3, < 5.0.0)
colored (~> 1.2)
commander (~> 4.6)
csv (~> 3.3)
Expand All @@ -146,17 +149,20 @@ GEM
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
google-cloud-env (>= 1.6.0, < 2.0.0)
google-cloud-env (>= 1.6.0, <= 2.1.1)
google-cloud-storage (~> 1.31)
highline (~> 2.0)
http-cookie (~> 1.0.5)
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
logger (>= 1.6, < 2.0)
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
mutex_m (~> 0.3.0)
naturally (~> 2.2)
nkf (~> 0.2.0)
optparse (>= 0.1.1, < 1.0.0)
ostruct (>= 0.1.0)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.5)
Expand All @@ -172,12 +178,13 @@ GEM
fastlane-plugin-firebase_app_distribution (0.10.1)
google-apis-firebaseappdistribution_v1 (~> 0.3.0)
google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
fastlane-plugin-wpmreleasetoolkit (13.8.1)
activesupport (>= 6.1.7.1)
fastlane-plugin-wpmreleasetoolkit (14.3.0)
activesupport (>= 6.1.7.1, < 8)
buildkit (~> 1.5)
chroma (= 0.2.0)
diffy (~> 3.3)
fastlane (~> 2.213)
fastlane (~> 2.231)
gettext (~> 3.5)
git (~> 1.3)
google-cloud-storage (~> 1.31)
java-properties (~> 0.3.0)
Expand All @@ -191,6 +198,14 @@ GEM
xcodeproj (~> 1.22)
fastlane-sirp (1.0.0)
sysrandom (~> 1.0)
fiddle (1.1.8)
forwardable (1.4.0)
gettext (3.5.2)
erubi
locale (>= 2.0.5)
prime
racc
text (>= 1.3.0)
gh_inspector (1.1.3)
git (1.19.1)
addressable (~> 2.8)
Expand Down Expand Up @@ -255,20 +270,21 @@ GEM
kramdown (~> 2.0)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
locale (2.1.5)
fiddle
logger (1.7.0)
mini_magick (4.13.2)
mini_mime (1.1.5)
mini_portile2 (2.8.9)
minitest (6.0.2)
drb (~> 2.0)
prism (~> 1.5)
minitest (5.27.0)
multi_json (1.18.0)
multipart-post (2.4.1)
mutex_m (0.3.0)
nanaimo (0.4.0)
nap (1.1.0)
naturally (2.3.0)
nokogiri (1.19.1)
nkf (0.2.0)
nokogiri (1.19.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
octokit (6.1.1)
Expand All @@ -279,11 +295,15 @@ GEM
options (2.3.2)
optparse (0.8.1)
os (1.1.4)
ostruct (0.6.3)
parallel (1.27.0)
parser (3.3.9.0)
ast (~> 2.4.1)
racc
plist (3.7.2)
prime (0.1.4)
forwardable
singleton
prism (1.9.0)
progress_bar (1.3.4)
highline (>= 1.6)
Expand Down Expand Up @@ -334,10 +354,12 @@ GEM
simctl (1.6.10)
CFPropertyList
naturally
singleton (0.3.0)
sysrandom (1.0.5)
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
text (1.3.1)
trailblazer-option (0.1.2)
tty-cursor (0.7.1)
tty-screen (0.8.2)
Expand All @@ -347,7 +369,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 @@ -369,7 +390,7 @@ DEPENDENCIES
faraday (~> 1.10, >= 1.10.5)
fastlane (~> 2.226)
fastlane-plugin-firebase_app_distribution (~> 0.10)
fastlane-plugin-wpmreleasetoolkit (~> 13.8)
fastlane-plugin-wpmreleasetoolkit (~> 14.3)
google-apis-sheets_v4 (~> 0.26)
openssl (~> 4.0)

Expand Down
7 changes: 5 additions & 2 deletions fastlane/Fastfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ platform :android do
ensure_git_status_clean
Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)

# If a new version is passed, use it as source of truth from now on
# new_version: the release version being frozen (e.g. "8.9")
# new_beta_version: the first beta of that release (e.g. "8.9-rc-1"), written to version.properties
new_version = version || release_version_next
release_branch_name = "release/#{new_version}"
new_beta_version = beta_version_next(version_name: new_version)
Expand Down Expand Up @@ -148,8 +149,10 @@ platform :android do
release_notes_file_path: RELEASE_NOTES_SOURCE_PATH,
extracted_notes_file_path: EXTRACTED_RELEASE_NOTES_PATH
)
# After the version file is bumped to new_beta_version (e.g. "8.9-rc-1"),
# release_version_next reads it and computes the next release (e.g. "8.10").
android_update_release_notes(
new_version: new_version,
next_version: release_version_next,
Copy link

Copilot AI Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

next_version is being set to release_version_next, which re-computes based on the current version.properties at the time this runs (after you've already bumped to new_beta_version). This can yield the wrong value (e.g., 8.11) and it also ignores an explicit version: passed into the lane, despite the earlier comment that it becomes the source of truth. Consider passing the already-computed new_version (or storing the pre-bump next version in a variable and reusing it here) so the release notes bump matches the intended target version.

Suggested change
next_version: release_version_next,
next_version: new_version,

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Contributor Author

@iangmaia iangmaia Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

new_version is the version being frozen (e.g. "8.9"), and we need the section title to be the version after it ("8.10").

Copy link

Copilot AI Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

android_update_release_notes is now called with next_version:; with the repo currently pinning fastlane-plugin-wpmreleasetoolkit to 13.8.x in Gemfile.lock, this lane will raise an “unknown option”/parameter error until the lockfile is updated to a toolkit version that includes the new next_version parameter. Please bump the toolkit dependency (Gemfile.lock) alongside this change (or otherwise ensure the new toolkit version is in use in CI).

Suggested change
next_version: release_version_next,
version: release_version_next,

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Contributor Author

@iangmaia iangmaia Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎗️ Reminder to update release-toolkit once a new version has been released

release_notes_file_path: RELEASE_NOTES_SOURCE_PATH
)
push_to_git_remote(set_upstream: true, tags: false)
Expand Down