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

Release/3.2.0 backmerge #656

Merged
merged 54 commits into from
Jan 29, 2025
Merged

Release/3.2.0 backmerge #656

merged 54 commits into from
Jan 29, 2025

Conversation

pinarol
Copy link
Contributor

@pinarol pinarol commented Jan 27, 2025

Closes #

Description

Merge release branch changes into trunk

Testing Steps

CI green

andrewdmontgomery and others added 30 commits January 16, 2025 15:24
@andrewdmontgomery
Run docker run with --rm so that containers are removed after sto…
32e696f 
…pping
@andrewdmontgomery
Hide docker command when running with @
85279f8
@andrewdmontgomery
Remove old install-and-generate command
31fd547
@andrewdmontgomery
Add check-docker command, make it a dependency for any command that…
7b9784b 
… calls docker
@andrewdmontgomery
Return false instead of an exit code
204d3e7
@andrewdmontgomery
Add docker check (#639)
570cf1b
@pinarol
Refresh profile on the first upload success
0758276
@pinarol
Revert "Refresh profile on the first upload success"
096368d 
This reverts commit 26d73c6.
@pinarol
Refresh profile if gridResponseStatus is a success
0642879
@pinarol
Add unit test
9a082cc
@pinarol @andrewdmontgomery
Update Sources/GravatarUI/SwiftUI/AvatarPicker/AvatarPickerViewModel.…
343d1b0 
…swift

Co-authored-by: Andrew Montgomery <andrewdmontgomery@mac.com>
@andrewdmontgomery
Add Fastlane lane to validate Package.resolved
ae8ac4f
@andrewdmontgomery
Add validate-package-resolved to Makefile
e7b7064
@andrewdmontgomery
Update CI to validate Package.resolved
c277dc3
@andrewdmontgomery
Rubocop fixes
06528ca
@andrewdmontgomery
Remove unused comment
e95434c
@andrewdmontgomery
DEBUG: echo working directory
e69411e
@andrewdmontgomery
DEBUG: Add git diff
6545d37
@andrewdmontgomery
Xcodebuild clean, remove -disableAutomaticPackageResolution
a0f4430
@andrewdmontgomery
Add -skipPackageUpdates
35cb481
@andrewdmontgomery
Revert "DEBUG: Add git diff"
a380e5d 
This reverts commit 6545d37.
@andrewdmontgomery
Revert "DEBUG: echo working directory"
4c9da79 
This reverts commit e69411e.
@andrewdmontgomery
Refactor to include paths of uncommitted file changes in Error output
4b75e03
@andrewdmontgomery
Rubocop
c9442f2
@andrewdmontgomery
TEMP: revert the Package.resolved in order to test CI
b0f81f4
@andrewdmontgomery
Revert "TEMP: revert the Package.resolved in order to test CI"
16bfcc7 
This reverts commit b0f81f4.
@andrewdmontgomery
Update the Package.resolved file in the Demo project
c16f005
@andrewdmontgomery
Remove unrelated changes to .rubocop.yml
47374d1
@andrewdmontgomery
Add bundle-install as a dependency for the new makefile task
2485922
@pinarol
Add CI check to validate package.resolved (#643)
26a9066
andrewdmontgomery and others added 19 commits January 22, 2025 09:47
@andrewdmontgomery
Add Dangerfile checks for Package.resolved files
7d3733d
@andrewdmontgomery
Update Dangermattic gem to required version
dbba117
@andrewdmontgomery
TEST: Update Package.swift without updating the Demo project and both…
a92e6bf 
… of the Package.resolved files
@andrewdmontgomery
Fix Demo project check
6fbb8cd
@andrewdmontgomery
Restore Demo/Gravatar-Demo.xcodeproj/project.xcworkspace/xcshareddata…
76f0f75 
…/swiftpm/Package.resolved
@pinarol
Add one time force refresh ability for CachedAsyncImage and AvatarView (
f49296d 
#644)
@pinarol
Pass rating to the avatar request in the QE profile card
620ee09
@pinarol
Pass avatar rating in the demo app
8538859
@pinarol
Adds rating: .x to the avatar URL in the QE's profile card and some…
d2b2b0b 
… demo screens (#647)
@andrewdmontgomery
Add comments to describe Package.resolved checks
70f0996
@andrewdmontgomery
Update Buildkite pipeline to use install_swiftpm_dependencies where…
059857c 
… appropriate
@andrewdmontgomery
Update a8c-ci-toolkit to 3.9.1
9ea7e8b
@andrewdmontgomery
Revert "TEST: Update Package.swift without updating the Demo project …
5449b06 
…and both of the Package.resolved files"

This reverts commit a92e6bf.
@andrewdmontgomery
Add new line
b3eb31f
@andrewdmontgomery
Simplify handling the Demo project path in the pipeline.yml
7685c9a
@andrewdmontgomery
Add comment about proposed update to the Danger plug
89a92ce
@andrewdmontgomery
Refactor package.resovled check (#645)
3ab4e26
@andrewdmontgomery
Update localizations
d378318
@pinarol
Merge branch 'trunk' into release/3.2.0
5ef79e1 
# Conflicts:
#	Sources/GravatarUI/SwiftUI/AvatarPicker/AvatarPickerViewModel.swift
@pinarol pinarol added the release Releasing a new version label Jan 27, 2025
@pinarol pinarol self-assigned this Jan 27, 2025
@pinarol pinarol marked this pull request as ready for review January 27, 2025 14:00
@wpmobilebot
Copy link

wpmobilebot commented Jan 27, 2025 •
edited
Loading

Gravatar Prototype Build📲 You can test the changes from this Pull Request in Gravatar Prototype Build by scanning the QR code below to install the corresponding build.
App NameGravatar Prototype Build Gravatar Prototype Build
Build Number2087
Version1.0
Bundle IDcom.automattic.gravatar-sdk-demo-uikit.prototype-build
Commitc143236
App Center BuildGravatar SDK Demo - UIKit #585
 Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@andrewdmontgomery andrewdmontgomery merged commit c25e6a1 into trunk Jan 29, 2025
12 checks passed
@andrewdmontgomery andrewdmontgomery deleted the release/3.2.0-backmerge branch January 29, 2025 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewdmontgomery andrewdmontgomery andrewdmontgomery approved these changes

@etoledom etoledom Awaiting requested review from etoledom

Assignees

@pinarol pinarol

Labels
release Releasing a new version
Projects
None yet
Milestone
Milestone 5 - Quick Editor - M2
Development

Successfully merging this pull request may close these issues.
3 participants
@pinarol @wpmobilebot @andrewdmontgomery