Skip to content

Commit 8bcc35d

Browse files
FranzBuschFranzBusch
authored
[CI] Switch to reusable soundness (#2913)
# Motivation Switch to the reusable workflows from the swiftlang organization for soundness. # Modification This PR moves over to the new reusable soundness workflow. Additionally, it also deletes all files in this repo for the soundness checks since they are no longer needed.
1 parent 17ebfcd commit 8bcc35d

19 files changed

+296
-927
lines changed

‎.github/actions/pull_request_semver_label_checker/action.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ name: 'Pull request Semantic Version label checker'
33
description: 'Checks that at least one Semantic Version label is applied to the pull request'
44

55
inputs:
6-
token:
7-
description: 'A GitHub token'
8-
type: string
9-
default: ${{ github.token }}
6+
token:
7+
description: 'A GitHub token'
8+
type: string
9+
default: ${{ github.token }}
1010

1111
runs:
12-
using: "composite"
13-
steps:
14-
- name: Check labels
15-
shell: bash
16-
env:
17-
GH_TOKEN: ${{ inputs.token }}
18-
run: |
19-
gh pr view ${{ github.event.number }} --repo ${{ github.repository }} --json labels \
20-
| jq -e '[.labels[].name] | any(. == "semver/major" or . == "semver/minor" or . == "semver/patch" or . == "semver/none")'
12+
using: "composite"
13+
steps:
14+
- name: Check labels
15+
shell: bash
16+
env:
17+
GH_TOKEN: ${{ inputs.token }}
18+
run: |
19+
gh pr view ${{ github.event.number }} --repo ${{ github.repository }} --json labels \
20+
| jq -e '[.labels[].name] | any(. == "semver/major" or . == "semver/minor" or . == "semver/patch" or . == "semver/none")'

‎.github/workflows/benchmarks.yml

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,44 @@ name: Benchmarks
33
on:
44
workflow_call:
55
inputs:
6-
benchmark_package_path:
7-
type: string
8-
description: "Path to the directory containing the benchmarking package. Defaults to ."
9-
default: "."
10-
swift_package_arguments:
11-
type: string
12-
description: "Arguments to the switch package command invocation e.g. `--disable-sandbox`"
13-
linux_5_8_enabled:
14-
type: boolean
15-
description: "Boolean to enable the Linux 5.8 Swift version matrix job. Defaults to true."
16-
default: true
17-
linux_5_9_enabled:
18-
type: boolean
19-
description: "Boolean to enable the Linux 5.9 Swift version matrix job. Defaults to true."
20-
default: true
21-
linux_5_10_enabled:
22-
type: boolean
23-
description: "Boolean to enable the Linux 5.10 Swift version matrix job. Defaults to true."
24-
default: true
25-
linux_nightly_6_0_enabled:
26-
type: boolean
27-
description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
28-
default: true
29-
linux_nightly_main_enabled:
30-
type: boolean
31-
description: "Boolean to enable the Linux nightly main Swift version matrix job. Defaults to true."
32-
default: true
33-
6+
benchmark_package_path:
7+
type: string
8+
description: "Path to the directory containing the benchmarking package. Defaults to ."
9+
default: "."
10+
swift_package_arguments:
11+
type: string
12+
description: "Arguments to the switch package command invocation e.g. `--disable-sandbox`"
13+
linux_5_8_enabled:
14+
type: boolean
15+
description: "Boolean to enable the Linux 5.8 Swift version matrix job. Defaults to true."
16+
default: true
17+
linux_5_9_enabled:
18+
type: boolean
19+
description: "Boolean to enable the Linux 5.9 Swift version matrix job. Defaults to true."
20+
default: true
21+
linux_5_10_enabled:
22+
type: boolean
23+
description: "Boolean to enable the Linux 5.10 Swift version matrix job. Defaults to true."
24+
default: true
25+
linux_nightly_6_0_enabled:
26+
type: boolean
27+
description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
28+
default: true
29+
linux_nightly_main_enabled:
30+
type: boolean
31+
description: "Boolean to enable the Linux nightly main Swift version matrix job. Defaults to true."
32+
default: true
33+
3434
jobs:
35-
benchmarks:
36-
name: Benchmarks
37-
# Workaround https://github.com/nektos/act/issues/1875
38-
uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
39-
with:
40-
name: "Benchmarks"
41-
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q libjemalloc-dev && swift package --package-path ${{ inputs.benchmark_package_path }} ${{ inputs.swift_package_arguments }} benchmark baseline check --check-absolute-path ${{ inputs.benchmark_package_path }}/Thresholds/${SWIFT_VERSION}/"
42-
matrix_linux_5_8_enabled: ${{ inputs.linux_5_8_enabled }}
43-
matrix_linux_5_9_enabled: ${{ inputs.linux_5_9_enabled }}
44-
matrix_linux_5_10_enabled: ${{ inputs.linux_5_10_enabled }}
45-
matrix_linux_nightly_6_0_enabled: ${{ inputs.linux_nightly_6_0_enabled }}
46-
matrix_linux_nightly_main_enabled: ${{ inputs.linux_nightly_main_enabled }}
35+
benchmarks:
36+
name: Benchmarks
37+
# Workaround https://github.com/nektos/act/issues/1875
38+
uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
39+
with:
40+
name: "Benchmarks"
41+
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q libjemalloc-dev && swift package --package-path ${{ inputs.benchmark_package_path }} ${{ inputs.swift_package_arguments }} benchmark baseline check --check-absolute-path ${{ inputs.benchmark_package_path }}/Thresholds/${SWIFT_VERSION}/"
42+
matrix_linux_5_8_enabled: ${{ inputs.linux_5_8_enabled }}
43+
matrix_linux_5_9_enabled: ${{ inputs.linux_5_9_enabled }}
44+
matrix_linux_5_10_enabled: ${{ inputs.linux_5_10_enabled }}
45+
matrix_linux_nightly_6_0_enabled: ${{ inputs.linux_nightly_6_0_enabled }}
46+
matrix_linux_nightly_main_enabled: ${{ inputs.linux_nightly_main_enabled }}

‎.github/workflows/cxx_interop.yml

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@ name: Cxx interop
33
on:
44
workflow_call:
55
inputs:
6-
linux_5_8_enabled:
7-
type: boolean
8-
description: "Boolean to enable the Linux 5.8 Swift version matrix job. Defaults to true."
9-
default: true
10-
linux_5_9_enabled:
11-
type: boolean
12-
description: "Boolean to enable the Linux 5.9 Swift version matrix job. Defaults to true."
13-
default: true
14-
linux_5_10_enabled:
15-
type: boolean
16-
description: "Boolean to enable the Linux 5.10 Swift version matrix job. Defaults to true."
17-
default: true
18-
linux_nightly_6_0_enabled:
19-
type: boolean
20-
description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
21-
default: true
22-
linux_nightly_main_enabled:
23-
type: boolean
24-
description: "Boolean to enable the Linux nightly main Swift version matrix job. Defaults to true."
25-
default: true
26-
6+
linux_5_8_enabled:
7+
type: boolean
8+
description: "Boolean to enable the Linux 5.8 Swift version matrix job. Defaults to true."
9+
default: true
10+
linux_5_9_enabled:
11+
type: boolean
12+
description: "Boolean to enable the Linux 5.9 Swift version matrix job. Defaults to true."
13+
default: true
14+
linux_5_10_enabled:
15+
type: boolean
16+
description: "Boolean to enable the Linux 5.10 Swift version matrix job. Defaults to true."
17+
default: true
18+
linux_nightly_6_0_enabled:
19+
type: boolean
20+
description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
21+
default: true
22+
linux_nightly_main_enabled:
23+
type: boolean
24+
description: "Boolean to enable the Linux nightly main Swift version matrix job. Defaults to true."
25+
default: true
26+
2727
jobs:
28-
cxx-interop:
29-
name: Cxx interop
30-
# Workaround https://github.com/nektos/act/issues/1875
31-
uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
32-
with:
33-
name: "Cxx interop"
34-
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q jq && curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-cxx-interop-compatibility.sh | bash"
35-
matrix_linux_5_8_enabled: ${{ inputs.linux_5_8_enabled }}
36-
matrix_linux_5_9_enabled: ${{ inputs.linux_5_9_enabled }}
37-
matrix_linux_5_10_enabled: ${{ inputs.linux_5_10_enabled }}
38-
matrix_linux_nightly_6_0_enabled: ${{ inputs.linux_nightly_6_0_enabled }}
39-
matrix_linux_nightly_main_enabled: ${{ inputs.linux_nightly_main_enabled }}
28+
cxx-interop:
29+
name: Cxx interop
30+
# Workaround https://github.com/nektos/act/issues/1875
31+
uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
32+
with:
33+
name: "Cxx interop"
34+
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q jq && curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-cxx-interop-compatibility.sh | bash"
35+
matrix_linux_5_8_enabled: ${{ inputs.linux_5_8_enabled }}
36+
matrix_linux_5_9_enabled: ${{ inputs.linux_5_9_enabled }}
37+
matrix_linux_5_10_enabled: ${{ inputs.linux_5_10_enabled }}
38+
matrix_linux_nightly_6_0_enabled: ${{ inputs.linux_nightly_6_0_enabled }}
39+
matrix_linux_nightly_main_enabled: ${{ inputs.linux_nightly_main_enabled }}

‎.github/workflows/main.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
name: Main
22

33
on:
4-
push:
5-
branches: [main]
4+
push:
5+
branches: [main]
66

77
jobs:
8-
unit-tests:
9-
name: Unit tests
10-
# Workaround https://github.com/nektos/act/issues/1875
11-
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
12-
with:
13-
linux_5_8_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
14-
linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
15-
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
16-
linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
17-
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
8+
unit-tests:
9+
name: Unit tests
10+
# Workaround https://github.com/nektos/act/issues/1875
11+
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
12+
with:
13+
linux_5_8_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
14+
linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
15+
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
16+
linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
17+
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
1818

19-
benchmarks:
20-
name: Benchmarks
21-
# Workaround https://github.com/nektos/act/issues/1875
22-
uses: apple/swift-nio/.github/workflows/benchmarks.yml@main
23-
with:
24-
benchmark_package_path: "Benchmarks"
19+
benchmarks:
20+
name: Benchmarks
21+
# Workaround https://github.com/nektos/act/issues/1875
22+
uses: apple/swift-nio/.github/workflows/benchmarks.yml@main
23+
with:
24+
benchmark_package_path: "Benchmarks"
2525

26-
cxx-interop:
27-
name: Cxx interop
28-
# Workaround https://github.com/nektos/act/issues/1875
29-
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
26+
cxx-interop:
27+
name: Cxx interop
28+
# Workaround https://github.com/nektos/act/issues/1875
29+
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
3030

31-
integration-tests:
32-
name: Integration Tests
33-
# Workaround https://github.com/nektos/act/issues/1875
34-
uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
35-
with:
36-
name: "Integration tests"
37-
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q lsof dnsutils netcat-openbsd net-tools curl jq && ./scripts/integration_tests.sh"
31+
integration-tests:
32+
name: Integration Tests
33+
# Workaround https://github.com/nektos/act/issues/1875
34+
uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
35+
with:
36+
name: "Integration tests"
37+
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q lsof dnsutils netcat-openbsd net-tools curl jq && ./scripts/integration_tests.sh"

‎.github/workflows/pull_request.yml

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,50 @@
11
name: PR
22

33
on:
4-
pull_request:
5-
types: [opened, reopened, synchronize]
4+
pull_request:
5+
types: [opened, reopened, synchronize]
66

77
jobs:
8-
soundness:
9-
name: Soundness
10-
# Workaround https://github.com/nektos/act/issues/1875
11-
uses: apple/swift-nio/.github/workflows/soundness.yml@main
12-
with:
13-
license_header_check_project_name: "SwiftNIO"
8+
soundness:
9+
name: Soundness
10+
uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
11+
with:
12+
license_header_check_project_name: "SwiftNIO"
13+
# We need to move to 6.0 here but have to fix the new warnings first
14+
docs_check_container_image: "swift:5.10-noble"
1415

15-
unit-tests:
16-
name: Unit tests
17-
# Workaround https://github.com/nektos/act/issues/1875
18-
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
19-
with:
20-
linux_5_8_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
21-
linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
22-
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
23-
linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
24-
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
16+
unit-tests:
17+
name: Unit tests
18+
# Workaround https://github.com/nektos/act/issues/1875
19+
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
20+
with:
21+
linux_5_8_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
22+
linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
23+
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
24+
linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
25+
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
2526

26-
benchmarks:
27-
name: Benchmarks
28-
# Workaround https://github.com/nektos/act/issues/1875
29-
uses: apple/swift-nio/.github/workflows/benchmarks.yml@main
30-
with:
31-
benchmark_package_path: "Benchmarks"
27+
benchmarks:
28+
name: Benchmarks
29+
# Workaround https://github.com/nektos/act/issues/1875
30+
uses: apple/swift-nio/.github/workflows/benchmarks.yml@main
31+
with:
32+
benchmark_package_path: "Benchmarks"
3233

33-
cxx-interop:
34-
name: Cxx interop
35-
# Workaround https://github.com/nektos/act/issues/1875
36-
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
34+
cxx-interop:
35+
name: Cxx interop
36+
# Workaround https://github.com/nektos/act/issues/1875
37+
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
3738

38-
integration-tests:
39-
name: Integration Tests
40-
# Workaround https://github.com/nektos/act/issues/1875
41-
uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
42-
with:
43-
name: "Integration tests"
44-
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q lsof dnsutils netcat-openbsd net-tools curl jq && ./scripts/integration_tests.sh"
39+
integration-tests:
40+
name: Integration Tests
41+
# Workaround https://github.com/nektos/act/issues/1875
42+
uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
43+
with:
44+
name: "Integration tests"
45+
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q lsof dnsutils netcat-openbsd net-tools curl jq && ./scripts/integration_tests.sh"
4546

46-
swift-6-language-mode:
47-
name: Swift 6 Language Mode
48-
# Workaround https://github.com/nektos/act/issues/1875
49-
uses: apple/swift-nio/.github/workflows/swift_6_language_mode.yml@main
47+
swift-6-language-mode:
48+
name: Swift 6 Language Mode
49+
# Workaround https://github.com/nektos/act/issues/1875
50+
uses: apple/swift-nio/.github/workflows/swift_6_language_mode.yml@main

0 commit comments

Comments
 (0)