Skip to content

Commit bae7acb

Browse files
committed
Disable swift-syntax prebuilts (primarily on linux)
Because of problems Swift 6.2 exhibits with them on Linux. We may bring this back once 6.2 is fixed, or turn it off more precisely specifically only on linux, even when called from gradle etc.
1 parent cc0ff8f commit bae7acb

File tree

10 files changed

+21
-12
lines changed

10 files changed

+21
-12
lines changed

.github/workflows/pull_request.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Prepare CI Environment
3939
uses: ./.github/actions/prepare_env
4040
- name: Swift Build
41-
run: swift build
41+
run: swift build --disable-experimental-prebuilts # FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
4242
- name: Run documentation check
4343
run: ./.github/scripts/validate_docs.sh
4444

@@ -132,7 +132,7 @@ jobs:
132132
- name: Install jemalloc
133133
run: apt-get update && apt-get install -y libjemalloc-dev
134134
- name: Swift Benchmarks
135-
run: swift package --package-path Benchmarks/ benchmark
135+
run: swift package --package-path Benchmarks/ --disable-experimental-prebuilts benchmark # FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
136136

137137
test-swift:
138138
name: Test (Swift) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
@@ -152,9 +152,9 @@ jobs:
152152
- name: Prepare CI Environment
153153
uses: ./.github/actions/prepare_env
154154
- name: Swift Build
155-
run: "swift build --build-tests --disable-sandbox"
155+
run: swift build --build-tests --disable-sandbox --disable-experimental-prebuilts # FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
156156
- name: Swift Test
157-
run: "swift test"
157+
run: swift test --disable-experimental-prebuilts # FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
158158

159159
test-swift-macos:
160160
name: Test (Swift) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})

Samples/JavaDependencySampleApp/ci-validate.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ swift run --disable-sandbox
99
# explicitly invoke resolve without explicit path or dependency
1010
# the dependencies should be uses from the --swift-module
1111
swift run swift-java resolve \
12+
--disable-experimental-prebuilts # FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
1213
Sources/JavaCommonsCSV/swift-java.config \
1314
--swift-module JavaCommonsCSV \
1415
--output-directory .build/plugins/outputs/javadependencysampleapp/JavaCommonsCSV/destination/SwiftJavaPlugin/

Samples/JavaProbablyPrime/ci-validate.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
set -e
44
set -x
55

6-
swift run JavaProbablyPrime 1337
6+
# FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
7+
swift run \
8+
--disable-experimental-prebuilts \
9+
JavaProbablyPrime 1337

Samples/SwiftAndJavaJarSampleLib/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ def jextract = tasks.register("jextract", Exec) {
116116

117117
workingDir = layout.projectDirectory
118118
commandLine "swift"
119-
args("build") // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
119+
// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
120+
args("build", "--disable-experimental-prebuilts") // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
120121
// If we wanted to execute a specific subcommand, we can like this:
121122
// args("run",/*
122123
// "swift-java", "jextract",

Samples/SwiftJavaExtractFFMSampleApp/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ def jextract = tasks.register("jextract", Exec) {
101101

102102
workingDir = layout.projectDirectory
103103
commandLine "swift"
104-
args("build") // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
104+
// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
105+
args("build", "--disable-experimental-prebuilts") // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
105106
// If we wanted to execute a specific subcommand, we can like this:
106107
// args("run",/*
107108
// "swift-java", "jextract",

Samples/SwiftJavaExtractFFMSampleApp/ci-validate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -x
44
set -e
55

6-
swift build # as a workaround for building swift build from within gradle having issues on CI sometimes
6+
swift build --disable-experimental-prebuilts # FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
77

88
./gradlew run
99
./gradlew test

Samples/SwiftJavaExtractJNISampleApp/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ def jextract = tasks.register("jextract", Exec) {
102102

103103
workingDir = layout.projectDirectory
104104
commandLine "swift"
105-
args("build") // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
105+
// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
106+
args("build", "--disable-experimental-prebuilts") // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
106107
// If we wanted to execute a specific subcommand, we can like this:
107108
// args("run",/*
108109
// "swift-java", "jextract",

Samples/SwiftJavaExtractJNISampleApp/ci-validate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -x
44
set -e
55

6-
swift build # as a workaround for building swift build from within gradle having issues on CI sometimes
6+
swift build --disable-experimental-prebuilts # FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
77

88
./gradlew run
99
./gradlew test

SwiftKitCore/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ def compileSwift = tasks.register("compileSwift", Exec) {
8484

8585
workingDir = rootDir
8686
commandLine "swift"
87-
args("build", "--target", "SwiftRuntimeFunctions")
87+
// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
88+
args("build", "--disable-experimental-prebuilts", "--target", "SwiftRuntimeFunctions")
8889
}
8990
tasks.build {
9091
dependsOn("compileSwift")

SwiftKitFFM/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ def compileSwift = tasks.register("compileSwift", Exec) {
8686

8787
workingDir = rootDir
8888
commandLine "swift"
89-
args("build", "--target", "SwiftRuntimeFunctions")
89+
// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
90+
args("build", "--disable-experimental-prebuilts", "--target", "SwiftRuntimeFunctions")
9091
}
9192
tasks.build {
9293
dependsOn("compileSwift")

0 commit comments

Comments
 (0)