Skip to content

Commit 9844e31

Browse files
committed
debugging CI paths
1 parent e9ffca5 commit 9844e31

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- name: Prepare CI Environment
6161
uses: ./.github/actions/prepare_env
6262
- name: Swift Build
63-
run: "swift build --build-tests"
63+
run: "swift build --build-tests --disable-sandbox"
6464
- name: Swift Test
6565
run: "swift test"
6666

Samples/JavaDependencySampleApp/ci-validate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -x
66
# TODO: this is a workaround for build plugins getting stuck running the bootstrap plugin
77
cd ../../
88
swift build --product SwiftJavaBootstrapJavaTool
9-
.build/arm64-apple-macosx/debug/SwiftJavaBootstrapJavaTool --fetch Sources/JavaKitDependencyResolver/swift-java.config --module-name JavaKitDependencyResolver --output-directory .build/plugins/outputs/swift-java/JavaKitDependencyResolver/destination/SwiftJavaBootstrapJavaPlugin
9+
.build/debug/SwiftJavaBootstrapJavaTool --fetch Sources/JavaKitDependencyResolver/swift-java.config --module-name JavaKitDependencyResolver --output-directory .build/plugins/outputs/swift-java/JavaKitDependencyResolver/destination/SwiftJavaBootstrapJavaPlugin
1010

1111
cd -
1212
swift run --disable-sandbox

Sources/SwiftJavaBootstrapJavaTool/SwiftJavaBootstrapJavaTool.swift

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ final class SwiftJavaBootstrapJavaTool {
3535
}
3636

3737
func run() async throws {
38-
print("RUN SwiftJavaBootstrapJavaTool: \(CommandLine.arguments)")
38+
print("[debug][swift-java-bootstrap] RUN SwiftJavaBootstrapJavaTool: \(CommandLine.arguments.joined(separator: " "))")
3939

4040
var args = CommandLine.arguments
4141
_ = args.removeFirst() // executable
@@ -48,8 +48,10 @@ final class SwiftJavaBootstrapJavaTool {
4848

4949
assert(args.removeFirst() == "--output-directory")
5050
let outputDirectoryPath = args.removeFirst()
51-
52-
let config = try readConfiguration(configPath: URL(fileURLWithPath: configPath))
51+
52+
let configPathURL = URL(fileURLWithPath: configPath)
53+
print("[debug][swift-java-bootstrap] Load config: \(configPathURL.absoluteString)")
54+
let config = try readConfiguration(configPath: configPathURL)
5355

5456
// We only support a single dependency right now.
5557
let localGradleProjectDependencyName = (config.dependencies ?? []).filter {
@@ -65,9 +67,8 @@ final class SwiftJavaBootstrapJavaTool {
6567
"--rerun-tasks",
6668
// "--debug",
6769
// "\(localGradleProjectDependencyName):jar",
68-
"\(localGradleProjectDependencyName):\(printRuntimeClasspathTaskName)",
69-
],
70-
workingDirectory: "/Users/ktoso/code/swift-java"
70+
"\(localGradleProjectDependencyName):\(printRuntimeClasspathTaskName)"
71+
]
7172
)
7273

7374
let outString = String(

0 commit comments

Comments
 (0)