-
Notifications
You must be signed in to change notification settings - Fork 652
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[GHA] Make unit tests, benchmarks and cxx interop easier to reuse #2801
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
bf5cabe
[GHA] Make unit tests, benchmarks and cxx interop easier to reuse
FranzBusch 9ad513d
Review comments
FranzBusch 12bd6c5
Pass benchmark path
FranzBusch e0372b2
Rename and cleanup
FranzBusch 5cb864f
Remove default arguments for testing
FranzBusch 9bc8b3c
Rename integration test checks
FranzBusch File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
name: Benchmarks | ||
|
||
on: | ||
workflow_call: | ||
inputs: | ||
benchmark_package_path: | ||
type: string | ||
description: "Path to the directory containing the benchmarking package. Defaults to ." | ||
default: "." | ||
swift_package_arguments: | ||
type: string | ||
description: "Arguments to the switch package command invocation e.g. `--disable-sandbox`" | ||
linux_5_8_enabled: | ||
type: boolean | ||
description: "Boolean to enable the Linux 5.8 Swift version matrix job. Defaults to true." | ||
default: true | ||
linux_5_9_enabled: | ||
type: boolean | ||
description: "Boolean to enable the Linux 5.9 Swift version matrix job. Defaults to true." | ||
default: true | ||
linux_5_10_enabled: | ||
type: boolean | ||
description: "Boolean to enable the Linux 5.10 Swift version matrix job. Defaults to true." | ||
default: true | ||
linux_nightly_6_0_enabled: | ||
type: boolean | ||
description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true." | ||
default: true | ||
linux_nightly_main_enabled: | ||
type: boolean | ||
description: "Boolean to enable the Linux nightly main Swift version matrix job. Defaults to true." | ||
default: true | ||
|
||
jobs: | ||
benchmarks: | ||
name: Benchmarks | ||
uses: ./.github/workflows/swift_matrix.yml | ||
with: | ||
name: "Benchmarks" | ||
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}/" | ||
matrix_linux_5_8_enabled: ${{ inputs.linux_5_8_enabled }} | ||
matrix_linux_5_9_enabled: ${{ inputs.linux_5_9_enabled }} | ||
matrix_linux_5_10_enabled: ${{ inputs.linux_5_10_enabled }} | ||
matrix_linux_nightly_6_0_enabled: ${{ inputs.linux_nightly_6_0_enabled }} | ||
matrix_linux_nightly_main_enabled: ${{ inputs.linux_nightly_main_enabled }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
name: Cxx interop | ||
|
||
on: | ||
workflow_call: | ||
inputs: | ||
linux_5_8_enabled: | ||
type: boolean | ||
description: "Boolean to enable the Linux 5.8 Swift version matrix job. Defaults to true." | ||
default: true | ||
linux_5_9_enabled: | ||
type: boolean | ||
description: "Boolean to enable the Linux 5.9 Swift version matrix job. Defaults to true." | ||
default: true | ||
linux_5_10_enabled: | ||
type: boolean | ||
description: "Boolean to enable the Linux 5.10 Swift version matrix job. Defaults to true." | ||
default: true | ||
linux_nightly_6_0_enabled: | ||
type: boolean | ||
description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true." | ||
default: true | ||
linux_nightly_main_enabled: | ||
type: boolean | ||
description: "Boolean to enable the Linux nightly main Swift version matrix job. Defaults to true." | ||
default: true | ||
|
||
jobs: | ||
cxx-interop: | ||
name: Cxx interop | ||
uses: ./.github/workflows/swift_matrix.yml | ||
with: | ||
name: "Cxx interop" | ||
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" | ||
matrix_linux_5_8_enabled: ${{ inputs.linux_5_8_enabled }} | ||
matrix_linux_5_9_enabled: ${{ inputs.linux_5_9_enabled }} | ||
matrix_linux_5_10_enabled: ${{ inputs.linux_5_10_enabled }} | ||
matrix_linux_nightly_6_0_enabled: ${{ inputs.linux_nightly_6_0_enabled }} | ||
matrix_linux_nightly_main_enabled: ${{ inputs.linux_nightly_main_enabled }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,43 +1,39 @@ | ||
name: Pull Request | ||
|
||
on: | ||
pull_request: | ||
types: [opened, reopened, synchronize] | ||
pull_request: | ||
types: [opened, reopened, synchronize] | ||
|
||
jobs: | ||
call-pull-request-soundness-workflow: | ||
name: Soundness | ||
uses: ./.github/workflows/pull_request_soundness.yml | ||
with: | ||
license_header_check_project_name: "SwiftNIO" | ||
soundness: | ||
name: Soundness | ||
uses: ./.github/workflows/soundness.yml | ||
with: | ||
license_header_check_project_name: "SwiftNIO" | ||
|
||
call-pull-request-unit-tests-workflow: | ||
name: Unit tests | ||
uses: ./.github/workflows/pull_request_swift_matrix.yml | ||
with: | ||
name: "Unit tests" | ||
matrix_linux_command: "swift test -Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" | ||
# Disable warnings as errors: Swift 6 emits sendability warnings that haven't been dealt with yet. | ||
matrix_linux_nightly_main_command_override: "swift test --explicit-target-dependency-import-check error" | ||
matrix_linux_nightly_6_0_command_override: "swift test --explicit-target-dependency-import-check error" | ||
unit-tests: | ||
name: Checks | ||
uses: ./.github/workflows/unit_tests.yml | ||
with: | ||
linux_5_8_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" | ||
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_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error" | ||
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error" | ||
|
||
call-pull-request-benchmark-workflow: | ||
name: Benchmarks | ||
uses: ./.github/workflows/pull_request_swift_matrix.yml | ||
with: | ||
name: "Benchmarks" | ||
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q libjemalloc-dev && swift package --package-path Benchmarks/ --disable-sandbox benchmark baseline check --check-absolute-path Benchmarks/Thresholds/${SWIFT_VERSION}/" | ||
benchmarks: | ||
name: Checks | ||
uses: ./.github/workflows/benchmarks.yml | ||
with: | ||
benchmark_package_path: "Benchmarks" | ||
|
||
call-pull-request-cxx-interop-workflow: | ||
name: Cxx interop | ||
uses: ./.github/workflows/pull_request_swift_matrix.yml | ||
with: | ||
name: "Cxx interop" | ||
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q jq && ./scripts/check-cxx-interop-compatibility.sh" | ||
cxx-interop: | ||
name: Checks | ||
uses: ./.github/workflows/cxx_interop.yml | ||
|
||
call-pull-request-integration-tests-workflow: | ||
name: Integration tests | ||
uses: ./.github/workflows/pull_request_swift_matrix.yml | ||
with: | ||
name: "Integration tests" | ||
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" | ||
integration-tests: | ||
name: Checks / Integration Tests | ||
uses: ./.github/workflows/swift_matrix.yml | ||
with: | ||
name: "Integration tests" | ||
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" |
2 changes: 1 addition & 1 deletion
2
.github/workflows/pull_request_soundness.yml → .github/workflows/soundness.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
name: Pull Request | ||
name: Soundness | ||
|
||
on: | ||
workflow_call: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
name: Unit tests | ||
|
||
on: | ||
workflow_call: | ||
inputs: | ||
linux_5_8_enabled: | ||
type: boolean | ||
description: "Boolean to enable the Linux 5.8 Swift version matrix job. Defaults to true." | ||
default: true | ||
linux_5_8_arguments_override: | ||
type: string | ||
description: "The arguments passed to swift test in the Linux 5.8 Swift version matrix job." | ||
default: "" | ||
linux_5_9_enabled: | ||
type: boolean | ||
description: "Boolean to enable the Linux 5.9 Swift version matrix job. Defaults to true." | ||
default: true | ||
linux_5_9_arguments_override: | ||
type: string | ||
description: "The arguments passed to swift test in the Linux 5.9 Swift version matrix job." | ||
default: "" | ||
linux_5_10_enabled: | ||
type: boolean | ||
description: "Boolean to enable the Linux 5.10 Swift version matrix job. Defaults to true." | ||
default: true | ||
linux_5_10_arguments_override: | ||
type: string | ||
description: "The arguments passed to swift test in the Linux 5.10 Swift version matrix job." | ||
default: "" | ||
linux_nightly_6_0_enabled: | ||
type: boolean | ||
description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true." | ||
default: true | ||
linux_nightly_6_0_arguments_override: | ||
type: string | ||
description: "The arguments passed to swift test in the Linux nightly 6.0 Swift version matrix job." | ||
default: "" | ||
linux_nightly_main_enabled: | ||
type: boolean | ||
description: "Boolean to enable the Linux nightly main Swift version matrix job. Defaults to true." | ||
default: true | ||
linux_nightly_main_arguments_override: | ||
type: string | ||
description: "The arguments passed to swift test in the Linux nightly main Swift version matrix job." | ||
default: "" | ||
|
||
jobs: | ||
unit-tests: | ||
name: Unit tests | ||
uses: ./.github/workflows/swift_matrix.yml | ||
with: | ||
name: "Unit tests" | ||
matrix_linux_command: "swift test" | ||
matrix_linux_5_8_enabled: ${{ inputs.linux_5_8_enabled }} | ||
matrix_linux_5_8_command_override: "swift test ${{ inputs.linux_5_8_arguments_override }}" | ||
matrix_linux_5_9_enabled: ${{ inputs.linux_5_9_enabled }} | ||
matrix_linux_5_9_command_override: "swift test ${{ inputs.linux_5_9_arguments_override }}" | ||
matrix_linux_5_10_enabled: ${{ inputs.linux_5_10_enabled }} | ||
matrix_linux_5_10_command_override: "swift test ${{ inputs.linux_5_10_arguments_override }}" | ||
matrix_linux_nightly_6_0_enabled: ${{ inputs.linux_nightly_6_0_enabled }} | ||
matrix_linux_nightly_6_0_command_override: "swift test ${{ inputs.linux_nightly_6_0_arguments_override }}" | ||
matrix_linux_nightly_main_enabled: ${{ inputs.linux_nightly_main_enabled }} | ||
matrix_linux_nightly_main_command_override: "swift test ${{ inputs.linux_nightly_main_arguments_override }}" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: Any reason to not spell this as "C++" when we have a string label?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Kinda stayed consistent with the script name and the flag that's set in the
Package.swift
. Also AFAIK all of C++/Cpp/Cxx is valid to use.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, they're all valid and I'm fine with keeping it. I always assumed Cxx and Cpp were there for when we couldn't use non-ascii characters, like in command line flags and file extensions.