Update from hummingbird-project-template 564b9b525b04f0705e59cd1189d9…

…0eb9f6f2233b (#30) Co-authored-by: adam-fowler <[email protected]>
hummingbird-project · Sep 18, 2024 · f6fa43b · f6fa43b
1 parent 05567b5
commit f6fa43b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,13 +13,16 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-ci
   cancel-in-progress: true
 
+env:
+  REDIS_HOSTNAME: redis
 jobs:
   linux:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     strategy:
       matrix:
-        image: ["swift:5.9", "swift:5.10", "swiftlang/swift:nightly-6.0-jammy"]
+        image: ["swift:5.9", "swift:5.10", "swift:6.0"]
+
     services:
       redis:
         image: redis
@@ -29,9 +32,6 @@ jobs:
 
     container:
       image: ${{ matrix.image }}
-      env:
-        REDIS_HOSTNAME: "redis"
-
     steps:
     - name: Checkout
       uses: actions/checkout@v4

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -3,13 +3,16 @@ name: Swift nightly build
 on:
   workflow_dispatch:
 
+env:
+  REDIS_HOSTNAME: redis
 jobs:
   linux:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     strategy:
       matrix:
         image: ['nightly-focal', 'nightly-jammy', 'nightly-amazonlinux2']
+
     services:
       redis:
         image: redis
@@ -19,9 +22,6 @@ jobs:
 
     container:
       image: swiftlang/swift:${{ matrix.image }}
-      env:
-        REDIS_HOSTNAME: "redis"
-
     steps:
     - name: Checkout
       uses: actions/checkout@v4

diff --git 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
@@ -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