From 29bfe82becc8e17e71cf6c1812c09a734301a88e Mon Sep 17 00:00:00 2001 From: Dimitri Bouniol Date: Sat, 1 Feb 2025 09:08:16 -0800 Subject: [PATCH 1/3] Moved CI workflows to swiftlang's github workflows Fixes #96 --- .github/workflows/main.yml | 9 +++------ .github/workflows/pull_request.yml | 13 +++---------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 49911b4..69d5deb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,10 +7,7 @@ on: jobs: unit-tests: name: Unit tests - uses: apple/swift-nio/.github/workflows/unit_tests.yml@main + uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main with: - linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" - linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" - linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - linux_nightly_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" + swift_flags: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" + swift_nightly_flags: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 6531fb3..60bacda 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -18,14 +18,7 @@ jobs: unit-tests: name: Unit tests - uses: apple/swift-nio/.github/workflows/unit_tests.yml@main + uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main with: - linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" - linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" - linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - linux_nightly_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - - cxx-interop: - name: Cxx interop - uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main + swift_flags: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" + swift_nightly_flags: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" From 565993c470d002e08f7ce334674557fd1fa5e1ce Mon Sep 17 00:00:00 2001 From: Dimitri Bouniol Date: Sat, 1 Feb 2025 09:09:03 -0800 Subject: [PATCH 2/3] Removed explicit yamllint disabling --- .github/workflows/pull_request.yml | 1 - .spi.yml | 2 +- .swiftlint.yml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 60bacda..53211ee 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -14,7 +14,6 @@ jobs: format_check_enabled: false license_header_check_enabled: false docs_check_enabled: false - yamllint_check_enabled: false unit-tests: name: Unit tests diff --git a/.spi.yml b/.spi.yml index 8c5ee82..2d69f2b 100644 --- a/.spi.yml +++ b/.spi.yml @@ -1,4 +1,4 @@ version: 1 builder: configs: - - documentation_targets: [WebAuthn] \ No newline at end of file + - documentation_targets: [WebAuthn] diff --git a/.swiftlint.yml b/.swiftlint.yml index b2ea2ec..0aac881 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -10,4 +10,4 @@ identifier_name: - rp line_length: - ignores_comments: true \ No newline at end of file + ignores_comments: true From b011ce13d6ee57a71344815410f076bd5bf52619 Mon Sep 17 00:00:00 2001 From: Dimitri Bouniol Date: Sat, 1 Feb 2025 09:09:23 -0800 Subject: [PATCH 3/3] Removed all workflows for Swift 5 Fixes #102 --- .github/workflows/main.yml | 1 + .github/workflows/pull_request.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 69d5deb..2d9cae1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,5 +9,6 @@ jobs: name: Unit tests uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main with: + exclude_swift_versions: "[{\"swift_version\": \"5.8\"}, {\"swift_version\": \"5.9\"}, {\"swift_version\": \"5.10\"}]" swift_flags: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" swift_nightly_flags: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 53211ee..f9492fc 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -19,5 +19,7 @@ jobs: name: Unit tests uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main with: + linux_exclude_swift_versions: "[{\"swift_version\": \"5.8\"}, {\"swift_version\": \"5.9\"}, {\"swift_version\": \"5.10\"}]" + windows_exclude_swift_versions: "[{\"swift_version\": \"5.8\"}, {\"swift_version\": \"5.9\"}, {\"swift_version\": \"5.10\"}]" swift_flags: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" swift_nightly_flags: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"