File tree Expand file tree Collapse file tree 2 files changed +15
-5
lines changed Expand file tree Collapse file tree 2 files changed +15
-5
lines changed Original file line number Diff line number Diff line change @@ -56,28 +56,38 @@ jobs:
56
56
pre-commit run --show-diff-on-failure --color=always --all-files
57
57
58
58
docker :
59
- name : Ubuntu Swift 5.10
59
+ name : Ubuntu Swift ${{ matrix.swift-version }}
60
60
runs-on : ubuntu-latest
61
61
timeout-minutes : 10
62
+ strategy :
63
+ fail-fast : false
64
+ matrix :
65
+ swift-version :
66
+ - " 5.10"
67
+ - " 6.0"
68
+ - " 6.1"
62
69
permissions :
63
70
packages : write
64
71
env :
65
72
DOCKER_VOLUME_PREFIX : .docker/
73
+ SWIFT : ${{ matrix.swift-version }}
66
74
steps :
67
75
- uses : actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
68
76
- name : Cache
69
77
uses : actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
70
78
with :
71
79
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 }}-
74
82
- name : Pull
75
83
run : |
76
84
docker compose pull --ignore-pull-failures ubuntu
77
85
- name : Build
78
86
run : |
79
87
docker compose build ubuntu
80
88
- name : Run
89
+ # We remove this when we support Swift 6.0 or later.
90
+ continue-on-error : ${{ matrix.swift-version != '5.10' }}
81
91
run : |
82
92
docker compose run --rm ubuntu
83
93
- name : Fix permission for .docker/
Original file line number Diff line number Diff line change @@ -37,12 +37,12 @@ services:
37
37
# Usage:
38
38
# docker compose build ubuntu
39
39
# docker compose run ubuntu
40
- image : ${REPO}:${ARCH}-ubuntu-${UBUNTU_CODE_NAME}
40
+ image : ${REPO}:${ARCH}-${SWIFT}- ubuntu-${UBUNTU_CODE_NAME}
41
41
build :
42
42
context : .
43
43
dockerfile : ci/docker/ubuntu.dockerfile
44
44
cache_from :
45
- - ${REPO}:${ARCH}-ubuntu-${UBUNTU_CODE_NAME}
45
+ - ${REPO}:${ARCH}-${SWIFT}- ubuntu-${UBUNTU_CODE_NAME}
46
46
args :
47
47
SWIFT : ${SWIFT}
48
48
UBUNTU_CODE_NAME : ${UBUNTU_CODE_NAME}
You can’t perform that action at this time.
0 commit comments