From b2c5e3e673f17352b14009d724a2e65cb4d7f248 Mon Sep 17 00:00:00 2001 From: "hummingbird-automation[bot]" <168462326+hummingbird-automation[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 12:54:28 +0100 Subject: [PATCH] Update from hummingbird-project-template 6c7f44e2f7e58f2d298a177e73421f244f41f90e (#53) --- .github/CODEOWNERS | 2 +- .github/workflows/ci.yml | 3 ++- .github/workflows/nightly.yml | 1 + .swiftformat | 2 +- Dockerfile | 2 +- scripts/validate.sh | 13 +++++++++++++ 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 1f09c56..d9dbc04 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @adam-fowler @Joannis +* @adam-fowler @Joannis diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f118174..e8b03b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,8 @@ jobs: timeout-minutes: 15 strategy: matrix: - image: ["swift:5.8", "swift:5.9", "swift:5.10", "swiftlang/swift:nightly-6.0-jammy"] + image: ["swift:5.9", "swift:5.10", "swift:6.0"] + container: image: ${{ matrix.image }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1009911..08e92b3 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -10,6 +10,7 @@ jobs: strategy: matrix: image: ['nightly-focal', 'nightly-jammy', 'nightly-amazonlinux2'] + container: image: swiftlang/swift:${{ matrix.image }} diff --git a/.swiftformat b/.swiftformat index 67acb74..14fb33f 100644 --- a/.swiftformat +++ b/.swiftformat @@ -2,7 +2,7 @@ --minversion 0.53.10 # Swift version ---swiftversion 5.8 +--swiftversion 5.9 # file options --exclude .build diff --git a/Dockerfile b/Dockerfile index 2c1d78c..c09c1c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # ================================ # Build image # ================================ -FROM swift:5.10 as build +FROM swift:6.0 as build WORKDIR /build diff --git a/scripts/validate.sh b/scripts/validate.sh index e96524b..bb67406 100755 --- a/scripts/validate.sh +++ b/scripts/validate.sh @@ -1,6 +1,19 @@ #!/bin/bash ##===----------------------------------------------------------------------===## ## +## This source file is part of the Hummingbird server framework project +## +## Copyright (c) 2021-2024 the Hummingbird authors +## Licensed under Apache License v2.0 +## +## See LICENSE.txt for license information +## See hummingbird/CONTRIBUTORS.txt for the list of Hummingbird authors +## +## SPDX-License-Identifier: Apache-2.0 +## +##===----------------------------------------------------------------------===## +##===----------------------------------------------------------------------===## +## ## This source file is part of the SwiftNIO open source project ## ## Copyright (c) 2017-2019 Apple Inc. and the SwiftNIO project authors