Enable cross-PR testing

Author: ahoppen

.github/workflows/pull_request.yml

@@ -8,9 +8,13 @@ jobs:
   tests:
     name: Test
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
-  soundness:
-    name: Soundness
-    uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
     with:
-      license_header_check_enabled: false
-      license_header_check_project_name: "Swift.org"
+      enable_windows_checks: false
+      linux_pre_build_command: |
+        swift cross-pr-checkout.swift
+  # soundness:
+  #   name: Soundness
+  #   uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
+  #   with:
+  #     license_header_check_enabled: false
+  #     license_header_check_project_name: "Swift.org"

Sources/SwiftFormat/Rules/UseShorthandTypeNames.swift

@@ -48,7 +48,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
     switch node.name.text {
     case "Array":
       guard let argument = genericArgumentList.firstAndOnly,
-            case .type(let typeArgument) = argument else {
+            case .type(let typeArgument) = argument.argument else {
         newNode = nil
         break
       }
@@ -62,7 +62,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
     case "Dictionary":
       guard let arguments = exactlyTwoChildren(of: genericArgumentList),
             case .type(let type0Argument) = arguments.0.argument,
-            caes .type(let type1Argument) = arguments.1.argument else {
+            case .type(let type1Argument) = arguments.1.argument else {
         newNode = nil
         break
       }
@@ -79,7 +79,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
         break
       }
       guard let argument = genericArgumentList.firstAndOnly,
-            case .type(let typeArgument) = argument else {
+            case .type(let typeArgument) = argument.argument else {
         newNode = nil
         break
       }
@@ -143,7 +143,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
     switch expression.baseName.text {
     case "Array":
       guard let argument = genericArgumentList.firstAndOnly,
-            case .type(let typeArgument) = argument else {
+            case .type(let typeArgument) = argument.argument else {
         newNode = nil
         break
       }
@@ -172,7 +172,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
 
     case "Optional":
       guard let argument = genericArgumentList.firstAndOnly,
-            case .type(let typeArgument) = argument else {
+            case .type(let typeArgument) = argument.argument else {
         newNode = nil
         break
       }

cross-pr-checkout.py

@@ -0,0 +1,33 @@
+import subprocess
+import pathlib
+import requests
+
+class CrossRepoPR:
+  org: str
+  repo: str
+  pr_num: str
+
+  def __init__(self, org: str, repo: str, pr_num: str) -> None:
+    self.org = org
+    self.repo = repo
+    self.pr_num = pr_num
+
+def cross_repo_prs() -> list[CrossRepoPR]:
+  return [
+    CrossRepoPR("swiftlang", "swift-syntax", "2859")
+  ]
+
+def run(cmd: list[str], cwd: str|None = None):
+  print(" ".join(cmd))
+  subprocess.check_call(cmd, cwd=cwd)
+
+def main():
+  for cross_repo_pr in cross_repo_prs():
+    run(["git", "clone", f"https://github.com/{cross_repo_pr.org}/{cross_repo_pr.repo}.git", f"{cross_repo_pr.repo}"], cwd="..")
+    run(["git", "fetch", "origin", f"pull/{cross_repo_pr.pr_num}/merge:pr_merge"], cwd="../swift-syntax")
+    run(["git", "checkout", "main"], cwd="../swift-syntax")
+    run(["git", "reset", "--hard", "pr_merge"], cwd="../swift-syntax")
+    run(["swift", "package", "config", "set-mirror", "--package-url", "https://github.com/swiftlang/swift-syntax.git", "--mirror-url", str(pathlib.Path("../swift-syntax").resolve())])
+
+if __name__ == "__main__":
+  main()

cross-pr-checkout.swift

@@ -0,0 +1,76 @@
+import Foundation
+
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+
+func run(_ executable: URL, _ arguments: String..., workingDirectory: URL? = nil) {
+  print("Running " + ([executable.path] + arguments).joined(separator: " "))
+  let process = Process()
+  process.executableURL = executable
+  process.arguments = arguments
+  if let workingDirectory {
+    process.currentDirectoryURL = workingDirectory
+  }
+
+  process.launch()
+  process.waitUntilExit()
+}
+
+struct CrossRepoPR {
+  let org: String
+  let repo: String
+  let prNum: String
+}
+
+let crossRepoPrs = [
+  CrossRepoPR(org: "swiftlang", repo: "swift-syntax", prNum: "2859")
+]
+
+func getBaseBranch(_ crossRepoPr: CrossRepoPR) throws -> String {
+  struct PR: Codable {
+    struct Base: Codable {
+      let ref: String
+    }
+    let base: Base
+  }
+
+  let data = try Data(
+    contentsOf: URL(
+      string: "https://api.github.com/repos/\(crossRepoPr.org)/\(crossRepoPr.repo)/pulls/\(crossRepoPr.prNum)"
+    )!
+  )
+  let decoded = try JSONDecoder().decode(PR.self, from: data)
+  return decoded.base.ref
+}
+
+print(ProcessInfo.processInfo.environment)
+
+for crossRepoPr in crossRepoPrs {
+  let git = URL(fileURLWithPath: "/usr/bin/git")
+  let swift = URL(fileURLWithPath: "/usr/bin/swift")
+  let baseBranch = try getBaseBranch(crossRepoPr)
+
+  let workspaceDir = URL(fileURLWithPath: "..")
+  let repoDir = workspaceDir.appendingPathComponent(crossRepoPr.repo)
+  run(
+    git,
+    "clone",
+    "https://github.com/\(crossRepoPr.org)/\(crossRepoPr.repo).git",
+    "\(crossRepoPr.repo)",
+    workingDirectory: workspaceDir
+  )
+  run(git, "fetch", "origin", "pull/\(crossRepoPr.prNum)/merge:pr_merge", workingDirectory: repoDir)
+  run(git, "checkout", baseBranch, workingDirectory: repoDir)
+  run(git, "reset", "--hard", "pr_merge", workingDirectory: repoDir)
+  run(
+    swift,
+    "package",
+    "config",
+    "set-mirror",
+    "--package-url",
+    "https://github.com/\(crossRepoPr.org)/\(crossRepoPr.repo).git",
+    "--mirror-url",
+    repoDir.resolvingSymlinksInPath().path
+  )
+}