Skip to content

Commit d691eda

Browse files
committed
build: remove package-benchmark from the dependencies
This package is not very Windows friendly. A partial port was attempted but revealed further Unixisms that will be difficult to port. There are alternative packages for benchmarking, e.g. google/swift-benchmark which may be a better choice.
1 parent fff9483 commit d691eda

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

.github/workflows/pull_request.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ jobs:
1212
# FIXME: Something is off with the format task and it gets "stuck", need to investigate
1313
format_check_enabled: false
1414
license_header_check_project_name: Swift.org
15+
env:
16+
SWIFT_JAVA_ENABLE_BENCHMARKING: NO
1517

1618
test-java:
1719
name: Java tests (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
@@ -86,6 +88,7 @@ jobs:
8688
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
8789
env:
8890
JAVA_HOME: "/usr/lib/jvm/default-jdk"
91+
SWIFT_JAVA_ENABLE_BENCHMARKING: NO
8992
steps:
9093
- uses: actions/checkout@v4
9194
- name: Install System Dependencies

Package.swift

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,17 @@ let javaIncludePath = "\(javaHome)/include"
3939
let javaPlatformIncludePath = "\(javaIncludePath)/win32"
4040
#endif
4141

42+
func sjEnableBenchmarking() -> Bool {
43+
if let value = ProcessInfo.processInfo.environment["SWIFT_JAVA_ENABLE_BENCHMARKING"] {
44+
switch value {
45+
case "TRUE", "YES", "1": return true
46+
case "FALSE", "NO", "0": return false
47+
default: break
48+
}
49+
}
50+
fatalError("Please set 'SWIFT_JAVA_ENABLE_BENCHMARKING' to 'TRUE' or 'FALSE'")
51+
}
52+
4253
let package = Package(
4354
name: "JavaKit",
4455
platforms: [
@@ -138,8 +149,10 @@ let package = Package(
138149
dependencies: [
139150
.package(url: "https://github.com/swiftlang/swift-syntax.git", branch: "main"),
140151
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
141-
.package(url: "https://github.com/ordo-one/package-benchmark", .upToNextMajor(from: "1.4.0")),
142-
],
152+
] + (sjEnableBenchmarking() ? [
153+
.package(url: "https://github.com/ordo-one/package-benchmark",
154+
.upToNextMajor(from: "1.4.0")),
155+
] : []),
143156
targets: [
144157
.macro(
145158
name: "JavaKitMacros",

0 commit comments

Comments
 (0)