From de520e077b11b76ab07796665de7f4bbd4b0b5f4 Mon Sep 17 00:00:00 2001 From: adam-fowler Date: Wed, 18 Sep 2024 08:36:33 +0000 Subject: [PATCH] Update from hummingbird-project-template 335ead3cc0e9b3feb5abac442f7054bb5e35de01 --- .github/CODEOWNERS | 2 +- .github/workflows/ci.yml | 3 ++- .github/workflows/nightly.yml | 1 + Dockerfile | 2 +- scripts/validate.sh | 0 5 files changed, 5 insertions(+), 3 deletions(-) mode change 100755 => 100644 scripts/validate.sh 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 63c828a..91525df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,8 @@ jobs: timeout-minutes: 15 strategy: matrix: - image: ["swift:5.10", "swiftlang/swift:nightly-6.0-jammy"] + image: ["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/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 old mode 100755 new mode 100644