From 8bfb2128bbe4680aea077c442244e456183d36dd Mon Sep 17 00:00:00 2001 From: adam-fowler Date: Sun, 15 Sep 2024 11:18:54 +0000 Subject: [PATCH 1/3] Update from hummingbird-project-template 52a2c1f50039efafa9a0c6eedeb674a817ec3606 --- .github/workflows/api-breakage.yml | 5 +++- .github/workflows/ci.yml | 5 +++- .github/workflows/validate.yml | 3 ++ .github/workflows/verify-documentation.yml | 35 ++++++++++++++++++++++ 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/verify-documentation.yml diff --git a/.github/workflows/api-breakage.yml b/.github/workflows/api-breakage.yml index 9919108..87eedac 100644 --- a/.github/workflows/api-breakage.yml +++ b/.github/workflows/api-breakage.yml @@ -2,13 +2,16 @@ name: API breaking changes on: pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }}-apibreakage + cancel-in-progress: true jobs: linux: runs-on: ubuntu-latest timeout-minutes: 15 container: - image: swift:5.10 + image: swift:latest steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 109d200..656ea85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,9 @@ on: - '**.yml' pull_request: workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }}-ci + cancel-in-progress: true jobs: linux: @@ -16,7 +19,7 @@ jobs: timeout-minutes: 15 strategy: matrix: - image: ["swift:5.10", "swiftlang/swift:nightly-6.0-jammy"] + image: ["swift:5.9", "swift:5.10", "swiftlang/swift:nightly-6.0-jammy"] container: image: ${{ matrix.image }} diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 17849a3..7cddf30 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -2,6 +2,9 @@ name: Validity Check on: pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }}-validate + cancel-in-progress: true jobs: validate: diff --git a/.github/workflows/verify-documentation.yml b/.github/workflows/verify-documentation.yml new file mode 100644 index 0000000..a587e6a --- /dev/null +++ b/.github/workflows/verify-documentation.yml @@ -0,0 +1,35 @@ +name: Verify Documentation + +on: + pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }}-verifydocs + cancel-in-progress: true + +jobs: + linux: + runs-on: ubuntu-latest + timeout-minutes: 15 + container: + image: swift:latest + steps: + - name: Install rsync 📚 + run: | + apt-get update && apt-get install -y rsync bc + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + path: "package" + - name: Checkout + uses: actions/checkout@v4 + with: + repository: "hummingbird-project/hummingbird-docs" + fetch-depth: 0 + path: "documentation" + - name: Verify + run: | + cd documentation + swift package edit ${GITHUB_REPOSITORY#*/} --path ../package + ./scripts/build-docc.sh -e + From 044edd4f54d051eb50a0520a80cabe8fb04e7212 Mon Sep 17 00:00:00 2001 From: Joannis Orlandos Date: Sun, 15 Sep 2024 15:19:28 +0300 Subject: [PATCH 2/3] Point to the right module (HummingbirdCore) for ResponseBodyWriter # Conflicts: # Sources/HummingbirdCompression/CompressedBodyWriter.swift --- Sources/HummingbirdCompression/CompressedBodyWriter.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/HummingbirdCompression/CompressedBodyWriter.swift b/Sources/HummingbirdCompression/CompressedBodyWriter.swift index a54e6a0..8254375 100644 --- a/Sources/HummingbirdCompression/CompressedBodyWriter.swift +++ b/Sources/HummingbirdCompression/CompressedBodyWriter.swift @@ -80,12 +80,12 @@ final class CompressedBodyWriter: R } extension ResponseBodyWriter { - /// Return ``/HummingbirdCore/ResponseBodyWriter`` that compresses the contents of this ResponseBodyWriter + /// Return ``HummingbirdCore/ResponseBodyWriter`` that compresses the contents of this ResponseBodyWriter /// - Parameters: /// - algorithm: Compression algorithm /// - windowSize: Window size (in bytes) to use when compressing data /// - logger: Logger used to output compression errors - /// - Returns: new ``/HummingbirdCore/ResponseBodyWriter`` + /// - Returns: new ``HummingbirdCore/ResponseBodyWriter`` public func compressed( algorithm: CompressionAlgorithm, windowSize: Int, From 607bb510553b8d402389ae701bfd0e7db529901e Mon Sep 17 00:00:00 2001 From: Joannis Orlandos Date: Sun, 15 Sep 2024 15:22:50 +0300 Subject: [PATCH 3/3] No 5.9 support in this lib! --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 656ea85..5bfc977 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: timeout-minutes: 15 strategy: matrix: - image: ["swift:5.9", "swift:5.10", "swiftlang/swift:nightly-6.0-jammy"] + image: ["swift:5.10", "swiftlang/swift:nightly-6.0-jammy"] container: image: ${{ matrix.image }}