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 updates into orm #4

Closed
wants to merge 15 commits into from
Closed

Merge updates into orm #4

wants to merge 15 commits into from

Conversation

awaltzforvenus
Copy link

This branch has updates from the synced fork of the upstream project, but we typically point SPM to the orm branch; the coinciding PR for this is currently pointed to the ticket branch, and this will instead allow us to point it to orm (after this is merged).

mbrandonw and others added 15 commits July 30, 2024 12:07
@mbrandonw @awaltzforvenus
Update Package.swift (pointfreeco#861)
5e81e07
@mbrandonw @awaltzforvenus
Run swift-format
fa5bde5
@Matejkob @awaltzforvenus
Add .editorconfig for consistent code formatting (pointfreeco#864)
5607ebb
@tgrapperon @awaltzforvenus
Configure isRecording default value with launch arguments (pointfre…
1e8c8cf 
…eco#862)
@stephencelis @awaltzforvenus
Run swift-format
2e3b9b5
@js @awaltzforvenus
Add diffToolBuilder for building complex diff command messages (poi…
4893911 
…ntfreeco#840)

* Add SnapshotTesting.diffToolBuilder for building complex diff command messages

It takes the existing and the failure snapshot as arguments, and thus complex commands which are not just prefixed with the existing diffTool can be created.

* Rename diffToolBuilder to diffToolCommand, replace diffTool with custom getter/setter
@stephencelis @awaltzforvenus
Run swift-format
7211112
@NachoSoto @awaltzforvenus
New canGenerateNewSnapshots to avoid automatically creating missing…
6240817 
… ones in CI (pointfreeco#768)

* New `canGenerateNewSnapshots` to avoid automatically creating missing ones in CI

Fixes pointfreeco#748.

* Update AssertSnapshot.swift
@mbrandonw @awaltzforvenus
Run swift-format
c35665b
@mbrandonw @stephencelis @awaltzforvenus
Beta support for Swift Testing, and other improvements. (pointfreeco#867
de4893c 
)

* wip

* wip

* wip

* wip

* wip

* tests

* wip

* migration guide

* wip

* wip

* wip

* Update Sources/SnapshotTesting/AssertSnapshot.swift

* wip

* formatting

* wip

* format

* more

* wip

* fix

* Make record mode opaque.

* more docs

* wip

* wip

* Added new 'failed' record strategy, and wrote some tests.

* remove test artificats

* wip

* more docs

* fix linux tests

* more test fixes

* test clean up

* debugging

* debug

* wip

* fix

* fix tests

* wip

* wip

* wip

* make snapshot configuration optional

* make snapshot configuration optional

* clean up

* fix

* indent

* typo

* more clean up

* record before difftool

* more tests

* clean up test code

---------

Co-authored-by: Stephen Celis <[email protected]>
@mbrandonw @awaltzforvenus
Run swift-format
93a43ab
@mbrandonw @stephencelis @awaltzforvenus
Fix recordIssue for Xcode beta 3. (pointfreeco#869)
836e3d0 
* Fix recordIssue for Xcode beta 3.

* wip

* wip

* fix

* wip

---------

Co-authored-by: Stephen Celis <[email protected]>
@stephencelis @awaltzforvenus
Point updated packages to swiftlang organization (pointfreeco#873)
7984636
@mbrandonw @awaltzforvenus
Fixed .failed record mode in inline snapshots. (pointfreeco#874)
b9adfa1 
* Fixed .failed record mode in inline snapshots.

* wip

* wip

* add some test coverage

* wip
@mbrandonw @awaltzforvenus
Run swift-format
bbe3173
@lj-dickey
Copy link

lj-dickey commented Jul 31, 2024 •
edited
Loading

So, how did you merge the newest changes on main in the original repo into your PR branch? In the past, what we've done is merge origin/main into orm (see commit 022ba98 or 70638ab. ). The last successful commit we had been using was ce751cc, which pre-dated us merging in origin/main in 70638ab, because that newer merge broke the web view snapshots. If that issue is fixed now, then we can definitely move to a newer version of the library. The way the git history looks right now, though, is not a merge of main into orm, but rather all of the newer changes in the remote repo showing up in your PR branch, which seems a bit confusing -- it makes it less clear where we've chosen to move to the newer version of the remote library by not having a merge from main.

@awaltzforvenus
Copy link
Author

Okay, so we're keeping main up to date with upstream, and just merging in to orm when it's time for us to update?

@lj-dickey
Copy link

Yup... that had been our plan all along, and it fell apart when the "latest" snapshot library couldn't pass our CI. So, we've been stuck on an older merge point, even though main was newer.

@awaltzforvenus
Copy link
Author

Okay, cool — I'll close this, and open up a PR for that. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@awaltzforvenus @lj-dickey @mbrandonw @Matejkob @tgrapperon @stephencelis @js @NachoSoto