Skip to content

Commit

Permalink
Merge pull request #8 from hummingbird-project/project-template-update
Browse files Browse the repository at this point in the history
Update from Hummingbird Project Template
  • Loading branch information
adam-fowler authored Sep 18, 2024
2 parents 04e51dd + 6f1b0d7 commit ad1fe69
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @adam-fowler @Joannis
* @adam-fowler @Joannis @thoven87
2 changes: 1 addition & 1 deletion .github/workflows/api-breakage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 15
container:
image: swift:5.10
image: swift:latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,9 +32,6 @@ jobs:

container:
image: ${{ matrix.image }}
env:
REDIS_HOSTNAME: "redis"

steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -19,9 +22,6 @@ jobs:

container:
image: swiftlang/swift:${{ matrix.image }}
env:
REDIS_HOSTNAME: "redis"

steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/verify-documentation.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ================================
# Build image
# ================================
FROM swift:5.10 as build
FROM swift:6.0 as build

WORKDIR /build

Expand Down
13 changes: 13 additions & 0 deletions scripts/validate.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit ad1fe69

Please sign in to comment.