Skip to content

Commit

Permalink
Merge branch 'main' into parallelise_directory_copies
Browse files Browse the repository at this point in the history
  • Loading branch information
UncleMattHope authored Jul 29, 2024
2 parents c9b6f55 + b6a6e43 commit 1509601
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 8 deletions.
14 changes: 9 additions & 5 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Pull Request
name: PR

on:
pull_request:
Expand All @@ -12,7 +12,7 @@ jobs:
license_header_check_project_name: "SwiftNIO"

unit-tests:
name: Checks
name: Unit tests
uses: ./.github/workflows/unit_tests.yml
with:
linux_5_8_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
Expand All @@ -22,18 +22,22 @@ jobs:
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"

benchmarks:
name: Checks
name: Benchmarks
uses: ./.github/workflows/benchmarks.yml
with:
benchmark_package_path: "Benchmarks"

cxx-interop:
name: Checks
name: Cxx interop
uses: ./.github/workflows/cxx_interop.yml

integration-tests:
name: Checks / Integration Tests
name: 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"

swift-6-language-mode:
name: Swift 6 Language Mode
uses: ./.github/workflows/swift_6_language_mode.yml
6 changes: 5 additions & 1 deletion .github/workflows/soundness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ on:
type: boolean
description: "Boolean to enable the format check job. Defaults to true."
default: true
shell_check_enabled:
type: boolean
description: "Boolean to enable the shell check job. Defaults to true."
default: true

## We are cancelling previously triggered workflow runs
concurrency:
Expand Down Expand Up @@ -133,7 +137,7 @@ jobs:
shell-check:
name: Shell check
if: ${{ inputs.format_check_enabled }}
if: ${{ inputs.shell_check_enabled }}
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/swift_6_language_mode.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Swift 6 language mode

on:
workflow_call:

## We are cancelling previously triggered workflow runs
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-swift-6-language-mode
cancel-in-progress: true

jobs:
swift-6-language-mode:
name: Swift 6 language mode
runs-on: ubuntu-latest
container:
image: swiftlang/swift:nightly-6.0-jammy
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Set the language mode
run: swift package tools-version --set 6.0
- name: Build with Swift 6 language mode
run: swift build -Xswiftc -warnings-as-errors
4 changes: 2 additions & 2 deletions .github/workflows/swift_matrix.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Pull Request
name: Matrix

on:
workflow_call:
Expand Down Expand Up @@ -54,7 +54,7 @@ concurrency:

jobs:
linux:
name: ${{ matrix.swift.swift_version }}
name: Linux (${{ matrix.swift.swift_version }})
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand Down

0 comments on commit 1509601

Please sign in to comment.