Skip to content

Commit fc5d79e

Browse files
committed
feat: Add support for Swift 6.1
1 parent e7e2ded commit fc5d79e

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.github/workflows/test.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,29 @@ jobs:
5656
pre-commit run --show-diff-on-failure --color=always --all-files
5757
5858
docker:
59-
name: Ubuntu Swift 5.10
59+
name: Ubuntu Swift ${{ matrix.swift-version }}
6060
runs-on: ubuntu-latest
6161
timeout-minutes: 10
62+
strategy:
63+
fail-fast: false
64+
matrix:
65+
swift-version:
66+
- "5.10"
67+
- "6.0"
68+
- "6.1"
6269
permissions:
6370
packages: write
6471
env:
6572
DOCKER_VOLUME_PREFIX: .docker/
73+
SWIFT: ${{ matrix.swift-version }}
6674
steps:
6775
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6876
- name: Cache
6977
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
7078
with:
7179
path: .docker
72-
key: docker-${{ hashFiles('**/Package.resolved', '**/go.sum') }}
73-
restore-keys: docker-
80+
key: docker-${{ matrix.swift-version }}-${{ hashFiles('**/Package.resolved', '**/go.sum') }}
81+
restore-keys: docker-${{ matrix.swift-version }}-
7482
- name: Pull
7583
run: |
7684
docker compose pull --ignore-pull-failures ubuntu

compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ services:
3737
# Usage:
3838
# docker compose build ubuntu
3939
# docker compose run ubuntu
40-
image: ${REPO}:${ARCH}-ubuntu-${UBUNTU_CODE_NAME}
40+
image: ${REPO}:${ARCH}-${SWIFT}-ubuntu-${UBUNTU_CODE_NAME}
4141
build:
4242
context: .
4343
dockerfile: ci/docker/ubuntu.dockerfile
4444
cache_from:
45-
- ${REPO}:${ARCH}-ubuntu-${UBUNTU_CODE_NAME}
45+
- ${REPO}:${ARCH}-${SWIFT}-ubuntu-${UBUNTU_CODE_NAME}
4646
args:
4747
SWIFT: ${SWIFT}
4848
UBUNTU_CODE_NAME: ${UBUNTU_CODE_NAME}

0 commit comments

Comments
 (0)