From f41c60a0bb974cd36f4c87f9a5b52027507e908a Mon Sep 17 00:00:00 2001 From: Euan Harris Date: Mon, 10 Mar 2025 11:27:28 +0000 Subject: [PATCH 1/3] workflows: Re-enable tests job --- .github/workflows/pull_request.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index c06cc36..dfae6cd 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -5,11 +5,11 @@ on: types: [opened, reopened, synchronize] jobs: - # tests: - # name: Test - # uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main - # with: - # linux_pre_build_command: apt-get update && apt-get install -y locales locales-all libsqlite3-dev + tests: + name: Test + uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main + with: + linux_pre_build_command: apt-get update && apt-get install -y locales locales-all libsqlite3-dev soundness: name: Soundness uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main From f300416d3b38295ff67d6d9186a5908af14bc384 Mon Sep 17 00:00:00 2001 From: Euan Harris Date: Mon, 10 Mar 2025 11:39:11 +0000 Subject: [PATCH 2/3] workflows: Disable tests on Windows Requires NIO support on Windows --- .github/workflows/pull_request.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index dfae6cd..fff448d 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -10,6 +10,7 @@ jobs: uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main with: linux_pre_build_command: apt-get update && apt-get install -y locales locales-all libsqlite3-dev + enable_windows_checks: false soundness: name: Soundness uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main From fe38e4849e671c9ebb930c1496a9594acbf810e9 Mon Sep 17 00:00:00 2001 From: Euan Harris Date: Mon, 10 Mar 2025 11:57:33 +0000 Subject: [PATCH 3/3] workflows: Disable end-to-end tests in GitHub Actions There is a good chance that GitHub Actions will be able to run these tests, but we will disable them for now in order to get the unit tests running. The end-to-end tests could not run with swift-ci, so disabling them here does not reduce CI coverage. --- Tests/SwiftSDKGeneratorTests/EndToEndTests.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Tests/SwiftSDKGeneratorTests/EndToEndTests.swift b/Tests/SwiftSDKGeneratorTests/EndToEndTests.swift index e5abd83..e18f543 100644 --- a/Tests/SwiftSDKGeneratorTests/EndToEndTests.swift +++ b/Tests/SwiftSDKGeneratorTests/EndToEndTests.swift @@ -121,7 +121,9 @@ final class RepeatedBuildTests: XCTestCase { private let logger = Logger(label: "swift-sdk-generator") func testRepeatedSDKBuilds() async throws { - if ProcessInfo.processInfo.environment.keys.contains("JENKINS_URL") { + if ProcessInfo.processInfo.environment.keys.contains("JENKINS_URL") + || ProcessInfo.processInfo.environment.keys.contains("GITHUB_ACTIONS") + { throw XCTSkip( "EndToEnd tests cannot currently run in CI: https://github.com/swiftlang/swift-sdk-generator/issues/145" ) @@ -296,7 +298,9 @@ func buildTestcases(config: SDKConfiguration) async throws { var logger = Logger(label: "EndToEndTests") logger[metadataKey: "testcase"] = "testPackageInitExecutable" - if ProcessInfo.processInfo.environment.keys.contains("JENKINS_URL") { + if ProcessInfo.processInfo.environment.keys.contains("JENKINS_URL") + || ProcessInfo.processInfo.environment.keys.contains("GITHUB_ACTIONS") + { throw XCTSkip( "EndToEnd tests cannot currently run in CI: https://github.com/swiftlang/swift-sdk-generator/issues/145" )