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.

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

[gardening] Merge the release/1.3.0 branch back into main #178

Merged
merged 19 commits into from
Jul 3, 2024

Conversation

glessard
Copy link
Contributor

@glessard glessard commented May 16, 2024

Ensure that no changes from 1.3.0 are missing on main.

glessard and others added 19 commits May 9, 2024 16:03
Co-authored-by: Hiroshi Yamauchi <[email protected]>
Replaced with a constant defined in the package manifest.
[1.3][CMake] Restore to working order on Apple platforms
# Conflicts:
#	.gitignore
#	.swiftci/5_10_ubuntu2204
#	.swiftci/5_8_ubuntu2204
#	.swiftci/5_9_ubuntu2204
#	.swiftci/nightly_6_0_macos
#	.swiftci/nightly_6_0_ubuntu2204
#	.swiftci/nightly_main_macos
#	.swiftci/nightly_main_ubuntu2204
#	.swiftci/nightly_main_windows
#	Package.swift
#	Sources/System/Internals/CInterop.swift
#	Sources/System/Internals/Constants.swift
#	Sources/System/Internals/Exports.swift
#	Sources/System/Internals/Syscalls.swift
#	Tests/SystemTests/FileOperationsTest.swift
@glessard
Copy link
Contributor Author

@swift-ci please test

@glessard glessard marked this pull request as ready for review May 16, 2024 20:53
@glessard glessard marked this pull request as draft May 16, 2024 20:53
@glessard glessard marked this pull request as ready for review May 22, 2024 20:40
@glessard
Copy link
Contributor Author

glessard commented May 22, 2024

We could update/fast-forward main to this commit if we're happy with this PR, instead of having yet another merge.

@glessard glessard merged commit 05fb1f1 into main Jul 3, 2024
2 checks passed
@glessard glessard deleted the dev/merge-1.3.0-back-to-main branch July 3, 2024 23:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants