From 04a7e9f70a549173d1a4eba79047a1414bf55cba Mon Sep 17 00:00:00 2001 From: "hummingbird-automation[bot]" <168462326+hummingbird-automation[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2024 13:07:01 +0100 Subject: [PATCH] Update from hummingbird-project-template e3f57311d7cc5cffc08d6c9da39c155d4c0d4cfd (#32) Co-authored-by: adam-fowler --- .github/dependabot.yml | 2 +- .github/workflows/api-breakage.yml | 3 +-- .github/workflows/ci.yml | 2 +- .swiftformat | 2 +- Dockerfile | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 998fd4c..a54e14d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -12,7 +12,7 @@ updates: directory: "/" schedule: interval: "daily" - open-pull-requests-limit: 6 + open-pull-requests-limit: 5 allow: - dependency-type: all groups: diff --git a/.github/workflows/api-breakage.yml b/.github/workflows/api-breakage.yml index dd4bcb4..9919108 100644 --- a/.github/workflows/api-breakage.yml +++ b/.github/workflows/api-breakage.yml @@ -1,4 +1,3 @@ -# This will be interesting to see how often AWS break there own APIs name: API breaking changes on: @@ -9,7 +8,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 15 container: - image: swift:5.9 + image: swift:5.10 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba18949..a3853ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: timeout-minutes: 15 strategy: matrix: - image: ["swift:5.9", "swift:5.10", "swiftlang/swift:nightly-jammy"] + image: ["swift:5.9", "swift:5.10", "swiftlang/swift:nightly-6.0-jammy"] container: image: ${{ matrix.image }} diff --git a/.swiftformat b/.swiftformat index d800f8a..beb1d05 100644 --- a/.swiftformat +++ b/.swiftformat @@ -8,7 +8,7 @@ --exclude .build # rules ---disable redundantReturn, extensionAccessControl, typeSugar +--disable redundantReturn, extensionAccessControl, typeSugar, conditionalAssignment # format options --ifdef no-indent diff --git a/Dockerfile b/Dockerfile index 102200f..2c1d78c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # ================================ # Build image # ================================ -FROM swift:5.9 as build +FROM swift:5.10 as build WORKDIR /build @@ -15,4 +15,4 @@ RUN swift package resolve # Copy entire repo into container COPY . . -RUN swift test --enable-test-discovery --sanitize=thread +RUN swift test --sanitize=thread