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
4 changes: 2 additions & 2 deletions .github/workflows/package_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,8 @@ on:
# ----- FreeBSD -----
enable_freebsd:
type: boolean
description: "Boolean to enable FreeBSD testing."
default: false
description: "Run the tests on FreeBSD. Set false to skip it."
default: true
freebsd_swift_versions:
type: string
description: "FreeBSD Swift version list (JSON array)."
Expand Down
15 changes: 6 additions & 9 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,19 +151,14 @@ jobs:
name: Unified package test
uses: ./.github/workflows/package_test.yml
with:
# Every platform enters the package below the repository root, the FreeBSD VM included.
package_path: tests/TestPackage
linux_swift_versions: '["6.3", "nightly-main"]'
linux_setup_command: cd tests/TestPackage
windows_swift_versions: '["6.3"]'
windows_setup_command: cd tests/TestPackage
windows_command: Invoke-Program swift build
# The static SDK build and the Cxx interop check are on by default.
# FreeBSD, the static SDK build and the Cxx interop check are on by default.
linux_static_sdk_versions: '["6.3"]'
# The SDK script builds in the working directory, so the setup command is
# the only way to reach a package below the repository root.
linux_static_sdk_setup_command: cd tests/TestPackage
# The Cxx interop check takes linux_setup_command as its setup command, so
# it enters tests/TestPackage too.
# The rest are off: this call is about Linux, Windows and the two checks above.
# The rest are off: this call is about Linux, Windows, FreeBSD and the checks above.
enable_macos: false
enable_macos_swiftly: false
enable_wasm_sdk_build: false
Expand Down Expand Up @@ -204,6 +199,7 @@ jobs:
# A container runs its commands under cmd, where Invoke-Program does not exist.
windows_command: swift build
# Only the Linux and Windows container paths are under test here.
enable_freebsd: false
enable_macos: false
enable_macos_swiftly: false
enable_linux_static_sdk_build: false
Expand All @@ -220,6 +216,7 @@ jobs:
# Named so this does not share a concurrency group with the other calls.
name: unified-package-test-commands
enable_windows: false
enable_freebsd: false
enable_macos: false
enable_macos_swiftly: false
enable_linux_static_sdk_build: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scripts/matrix/generate-matrix.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct Configuration {
@Input("ENABLE_MACOS") var macOSEnabled = true
@Input("ENABLE_MACOS_SWIFTLY") var swiftlyEnabled = true
@Input("ENABLE_WINDOWS") var windowsEnabled = true
@Input("ENABLE_FREEBSD") var freeBSDEnabled = false
@Input("ENABLE_FREEBSD") var freeBSDEnabled = true
@Input("ENABLE_ANDROID_EMULATOR_TESTS") var androidEmulatorEnabled = true
@Input("ENABLE_CXX_INTEROP") var cxxInteropEnabled = true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ struct PlatformSelectionTests {
#expect(generated.exitCode == 0)
}

@Test("Every platform but FreeBSD is on by default")
func everyPlatformButFreeBSDIsOnByDefault() throws {
@Test("Every platform is on by default")
func everyPlatformIsOnByDefault() throws {
let generated = try Generator.run(includePlatformDefaults: true)
#expect(Set(generated.platforms) == ["Linux", "macOS", "Windows"])
#expect(Set(generated.platforms) == ["FreeBSD", "Linux", "macOS", "Windows"])
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ struct EntryPointDefaultTests {
"Cxx interop Swift current",
"Cxx interop Swift nightly-release",
"Cxx interop Swift nightly-main",
"FreeBSD nightly-main - 14.3 - x86_64",
]
),
(
Expand Down
Loading