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

Merge 23.8.1 into release 23.9 #22217

Merged
merged 9 commits into from
Dec 13, 2023
Merged

Merge 23.8.1 into release 23.9 #22217

merged 9 commits into from
Dec 13, 2023

Conversation

mokagio
Copy link
Contributor

@mokagio mokagio commented Dec 13, 2023

As expected when merging the current release branch into an hotfix branch from the previous version, we got conflicts on the config/Version.*.xcconfig files.

As usual, I resolved them with git checkout --theirs, keeping the value from the release branch.

Includes:

mokagio and others added 9 commits December 13, 2023 09:48
@mokagio
Bump version number
8d697dd
@wargcm
Replace hyphen with dash in Bloganuary nudge text
0834423
@wargcm
Update Bloganury nude text's value to be one line
6155351
@mokagio
Replace hyphen with dash in Bloganuary nudge ar localization
244ffbd
@mokagio
Replace hyphen with em dash in Bloganuary nudge ar localization
41ccbcb
@mokagio
Replace hyphen with em dash in Bloganuary nudge ro localization
372a322
@mokagio
Replace hyphen with em dash in Bloganuary nudge text (#22213)
882a8e1
@mokagio
Update Fastlane to version 2.217.0
962d2f2 
This was done because the automation to upload metadata to ASC kept
failing due to being unable to find an editable version. Before looking
more into it, I decided to update Fastlane. The problem went away,
however I can't tell whether it was due to the update or just ASC
flakiness as the release notes don't explicitly mention this.

See https://github.com/fastlane/fastlane/releases/tag/2.217.0
@mokagio
Merge 'origin/release/23.9' into merge/hotfix-23.8.1-into-23.9
42f2751
@mokagio mokagio changed the base branch from trunk to release/23.9 December 13, 2023 04:40
@mokagio mokagio added this to the 23.9 ❄️ milestone Dec 13, 2023
@wpmobilebot
Copy link
Contributor

WordPress Alpha📲 You can test the changes from this Pull Request in WordPress Alpha by scanning the QR code below to install the corresponding build.
App NameWordPress Alpha WordPress Alpha
ConfigurationRelease-Alpha
Build Numberpr22217-42f2751
Version23.9
Bundle IDorg.wordpress.alpha
Commit42f2751
App Center BuildWPiOS - One-Offs #8115
 Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@wpmobilebot
Copy link
Contributor

Jetpack Alpha📲 You can test the changes from this Pull Request in Jetpack Alpha by scanning the QR code below to install the corresponding build.
App NameJetpack Alpha Jetpack Alpha
ConfigurationRelease-Alpha
Build Numberpr22217-42f2751
Version23.9
Bundle IDcom.jetpack.alpha
Commit42f2751
App Center Buildjetpack-installable-builds #7135
 Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

dvdchr
dvdchr approved these changes Dec 13, 2023
View reviewed changes
Copy link
Contributor

@dvdchr dvdchr left a comment

Choose a reason for hiding this comment

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

Verified that the changes in the .strings file are correct (uses the em dash). :shipit:

@mokagio mokagio merged commit 7ad9b11 into release/23.9 Dec 13, 2023
23 checks passed
@mokagio mokagio deleted the merge/hotfix-23.8.1-into-23.9 branch December 13, 2023 23:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dvdchr dvdchr dvdchr approved these changes

Assignees
No one assigned
Labels
Releases
Projects
None yet
Milestone
23.9
Development

Successfully merging this pull request may close these issues.
4 participants
@mokagio @wpmobilebot @dvdchr @wargcm