From 14719e8b2456f9cc41c66808d27e46be672623d3 Mon Sep 17 00:00:00 2001 From: Euan Harris Date: Thu, 10 Oct 2024 13:04:23 +0100 Subject: [PATCH 1/2] ci: Use the shared soundness workflow from swiftlang/github-workflows --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 3102b87..8b0e0bd 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -7,7 +7,7 @@ on: jobs: soundness: name: Soundness - uses: apple/swift-nio/.github/workflows/soundness.yml@main + uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main with: api_breakage_check_container_image: "swift:6.0-noble" docs_check_container_image: "swift:6.0-noble" From 1166fe35efafcf2012da5acd6e9ac6fbb0828fb9 Mon Sep 17 00:00:00 2001 From: Euan Harris Date: Thu, 10 Oct 2024 13:09:26 +0100 Subject: [PATCH 2/2] ci: Fix yamllint warnings --- .github/workflows/pull_request.yml | 30 +++++++++++++++--------------- .spi.yml | 6 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 8b0e0bd..35c660f 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -2,7 +2,7 @@ name: PR on: pull_request: - types: [opened, reopened, synchronize] + types: [opened, reopened, synchronize] jobs: soundness: @@ -31,25 +31,25 @@ jobs: registry: image: registry:2 ports: - - 5000:5000 + - 5000:5000 container: image: swift:6.0-noble steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - persist-credentials: false + - name: Checkout repository + uses: actions/checkout@v4 + with: + persist-credentials: false - - name: Mark the workspace as safe - # https://github.com/actions/checkout/issues/766 - run: git config --global --add safe.directory ${GITHUB_WORKSPACE} + - name: Mark the workspace as safe + # https://github.com/actions/checkout/issues/766 + run: git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Run test job - env: - REGISTRY_HOST: registry - REGISTRY_PORT: 5000 - run: | - swift test + - name: Run test job + env: + REGISTRY_HOST: registry + REGISTRY_PORT: 5000 + run: | + swift test swift-6-language-mode: name: Swift 6 Language Mode diff --git a/.spi.yml b/.spi.yml index e424596..9e0e1e1 100644 --- a/.spi.yml +++ b/.spi.yml @@ -1,6 +1,6 @@ version: 1 builder: configs: - - documentation_targets: - - containertool - - ContainerImageBuilderPlugin + - documentation_targets: + - containertool + - ContainerImageBuilderPlugin