Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Prepare CI Environment
uses: ./.github/actions/prepare_env
- name: Swift Build
run: swift build
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
- name: Run documentation check
run: ./.github/scripts/validate_docs.sh

Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
- name: Install jemalloc
run: apt-get update && apt-get install -y libjemalloc-dev
- name: Swift Benchmarks
run: swift package --package-path Benchmarks/ benchmark
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

test-swift:
name: Test (Swift) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
Expand All @@ -152,9 +152,9 @@ jobs:
- name: Prepare CI Environment
uses: ./.github/actions/prepare_env
- name: Swift Build
run: "swift build --build-tests --disable-sandbox"
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
- name: Swift Test
run: "swift test"
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

test-swift-macos:
name: Test (Swift) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
Expand Down
6 changes: 5 additions & 1 deletion Samples/JavaDependencySampleApp/ci-validate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ swift run --disable-sandbox

# explicitly invoke resolve without explicit path or dependency
# the dependencies should be uses from the --swift-module
swift run swift-java resolve \

# FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
swift run \
--disable-experimental-prebuilts \
swift-java resolve \
Sources/JavaCommonsCSV/swift-java.config \
--swift-module JavaCommonsCSV \
--output-directory .build/plugins/outputs/javadependencysampleapp/JavaCommonsCSV/destination/SwiftJavaPlugin/
5 changes: 4 additions & 1 deletion Samples/JavaProbablyPrime/ci-validate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@
set -e
set -x

swift run JavaProbablyPrime 1337
# FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
swift run \
--disable-experimental-prebuilts \
JavaProbablyPrime 1337
3 changes: 2 additions & 1 deletion Samples/SwiftAndJavaJarSampleLib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ def jextract = tasks.register("jextract", Exec) {

workingDir = layout.projectDirectory
commandLine "swift"
args("build") // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
args("build", "--disable-experimental-prebuilts") // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
// If we wanted to execute a specific subcommand, we can like this:
// args("run",/*
// "swift-java", "jextract",
Expand Down
3 changes: 2 additions & 1 deletion Samples/SwiftJavaExtractFFMSampleApp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ def jextract = tasks.register("jextract", Exec) {

workingDir = layout.projectDirectory
commandLine "swift"
args("build") // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
args("build", "--disable-experimental-prebuilts") // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
// If we wanted to execute a specific subcommand, we can like this:
// args("run",/*
// "swift-java", "jextract",
Expand Down
2 changes: 1 addition & 1 deletion Samples/SwiftJavaExtractFFMSampleApp/ci-validate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -x
set -e

swift build # as a workaround for building swift build from within gradle having issues on CI sometimes
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

./gradlew run
./gradlew test
3 changes: 2 additions & 1 deletion Samples/SwiftJavaExtractJNISampleApp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ def jextract = tasks.register("jextract", Exec) {

workingDir = layout.projectDirectory
commandLine "swift"
args("build") // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
args("build", "--disable-experimental-prebuilts") // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
// If we wanted to execute a specific subcommand, we can like this:
// args("run",/*
// "swift-java", "jextract",
Expand Down
2 changes: 1 addition & 1 deletion Samples/SwiftJavaExtractJNISampleApp/ci-validate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -x
set -e

swift build # as a workaround for building swift build from within gradle having issues on CI sometimes
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

./gradlew run
./gradlew test
3 changes: 2 additions & 1 deletion SwiftKitCore/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ def compileSwift = tasks.register("compileSwift", Exec) {

workingDir = rootDir
commandLine "swift"
args("build", "--target", "SwiftRuntimeFunctions")
// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
args("build", "--disable-experimental-prebuilts", "--target", "SwiftRuntimeFunctions")
}
tasks.build {
dependsOn("compileSwift")
Expand Down
3 changes: 2 additions & 1 deletion SwiftKitFFM/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ def compileSwift = tasks.register("compileSwift", Exec) {

workingDir = rootDir
commandLine "swift"
args("build", "--target", "SwiftRuntimeFunctions")
// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
args("build", "--disable-experimental-prebuilts", "--target", "SwiftRuntimeFunctions")
}
tasks.build {
dependsOn("compileSwift")
Expand Down
Loading