From ea297604dcd9fc8e1a94645812cb7d644b91b056 Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Tue, 29 Oct 2024 10:59:09 +0000 Subject: [PATCH] Unify main.yml and scheduled.yml, remove 5_8 ref (#214) ### Motivation: * `main.yml` and `scheduled.yml` are mostly duplicative. * Scheduled runs failed because of a deprecated reference to a Swift 5.8 pipeline ### Modifications: * Unify `main.yml` and `scheduled.yml` * Remove the reference to the 5.8 pipeline ### Result: Working scheduled runs. --- .github/workflows/main.yml | 3 ++- .github/workflows/scheduled.yml | 24 ------------------------ 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 .github/workflows/scheduled.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 28ffd1c..8c50a1f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,13 +3,14 @@ name: Main on: push: branches: [main] + schedule: + - cron: "0 8,20 * * *" jobs: unit-tests: name: Unit tests uses: apple/swift-nio/.github/workflows/unit_tests.yml@main with: - linux_5_8_enabled: false 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" diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml deleted file mode 100644 index 831f166..0000000 --- a/.github/workflows/scheduled.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Scheduled - -on: - schedule: - - cron: "0 8,20 * * *" - -jobs: - unit-tests: - name: Unit tests - uses: apple/swift-nio/.github/workflows/unit_tests.yml@main - with: - linux_5_8_enabled: false - 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_0_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" - - integration-tests: - name: Integration test - uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main - with: - name: "Integration test" - matrix_linux_command: "apt-get update -yq && apt-get install -yq lsof dnsutils netcat-openbsd net-tools expect curl jq && ./scripts/integration_tests.sh"