Skip to content

Commit feba87c

Browse files
committed
Merge branch 'main' of https://github.com/apple/swift-format into danthorpe/add_pre_commit_hooks
2 parents 1925645 + 11b7887 commit feba87c

File tree

83 files changed

+3334
-515
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+3334
-515
lines changed

.swiftci/5_10_ubuntu2204

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
LinuxSwiftPackageJob {
2+
swift_version_tag = "5.10-jammy"
3+
repo = "swift-format"
4+
branch = "main"
5+
}

.swiftci/5_7_ubuntu2204

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
LinuxSwiftPackageJob {
2+
swift_version_tag = "5.7-jammy"
3+
repo = "swift-format"
4+
branch = "main"
5+
}

.swiftci/5_8_ubuntu2204

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
LinuxSwiftPackageJob {
2+
swift_version_tag = "5.8-jammy"
3+
repo = "swift-format"
4+
branch = "main"
5+
}

.swiftci/5_9_ubuntu2204

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
LinuxSwiftPackageJob {
2+
swift_version_tag = "5.9-jammy"
3+
repo = "swift-format"
4+
branch = "main"
5+
}

.swiftci/nightly_6_0_macos

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
macOSSwiftPackageJob {
2+
swift_version = "6.0"
3+
repo = "swift-format"
4+
branch = "main"
5+
}

.swiftci/nightly_6_0_ubuntu2204

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
LinuxSwiftPackageJob {
2+
nightly_docker_tag = "nightly-6.0-jammy"
3+
repo = "swift-format"
4+
branch = "main"
5+
}

.swiftci/nightly_main_macos

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
macOSSwiftPackageJob {
2+
swift_version = "main"
3+
repo = "swift-format"
4+
branch = "main"
5+
}

.swiftci/nightly_main_ubuntu2204

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
LinuxSwiftPackageJob {
2+
nightly_docker_tag = "nightly-jammy"
3+
repo = "swift-format"
4+
branch = "main"
5+
}

.swiftci/nightly_main_windows

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
WindowsSwiftPackageWithDockerImageJob {
2+
docker_image = "swiftlang/swift:nightly-windowsservercore-1809"
3+
repo = "swift-format"
4+
branch = "main"
5+
sub_dir = "swift-format"
6+
label = "windows-server-2019"
7+
}

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ endif()
6868
find_package(SwiftSyntax CONFIG)
6969
if(NOT SwiftSyntax_FOUND)
7070
FetchContent_Declare(Syntax
71-
GIT_REPOSITORY https://github.com/apple/swift-syntax
71+
GIT_REPOSITORY https://github.com/swiftlang/swift-syntax
7272
GIT_TAG main)
7373
list(APPEND _SF_VENDOR_DEPENDENCIES Syntax)
7474
endif()

0 commit comments

Comments
 (0)