Skip to content

Commit 5fe86cb

Browse files
authored
chore: Run Ubuntu focal and noble in CI (#2033)
1 parent 49d4e46 commit 5fe86cb

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,18 +123,16 @@ jobs:
123123
linux:
124124
if: github.repository == 'awslabs/aws-sdk-swift' || github.event_name == 'pull_request'
125125
runs-on: ${{ matrix.runner }}
126-
container: swift:${{ matrix.version }}-${{ matrix.os }}
126+
container: swift:${{ matrix.swift }}
127127
strategy:
128128
fail-fast: false
129129
matrix:
130130
runner:
131131
- ubuntu-24.04
132132
- ubuntu-24.04-arm
133-
os:
134-
- jammy
135-
version:
136-
- "5.9"
137-
- "6.2"
133+
swift:
134+
- "5.9-jammy"
135+
- "6.2-noble"
138136
env:
139137
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
140138
steps:
@@ -163,10 +161,10 @@ jobs:
163161
path: |
164162
~/Library/Caches/org.swift.swiftpm
165163
~/.cache/org.swift.swiftpm
166-
key: 1-${{ runner.os }}-swift-${{ matrix.version }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
164+
key: 1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
167165
restore-keys: |
168-
1-${{ runner.os }}-swift-${{ matrix.version }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
169-
1-${{ runner.os }}-swift-${{ matrix.version }}-spm-
166+
1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
167+
1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-
170168
- name: Setup Java
171169
uses: actions/setup-java@v4
172170
with:

.github/workflows/integration-test.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,18 +132,16 @@ jobs:
132132
# Details on why AL2 isn't included: https://github.com/awslabs/aws-sdk-swift/pull/1833
133133
if: github.repository == 'awslabs/aws-sdk-swift' || github.event_name == 'pull_request'
134134
runs-on: ${{ matrix.runner }}
135-
container: swift:${{ matrix.version }}-${{ matrix.os }}
135+
container: swift:${{ matrix.swift }}
136136
strategy:
137137
fail-fast: false
138138
matrix:
139139
runner:
140140
- ubuntu-24.04
141141
- ubuntu-24.04-arm
142-
os:
143-
- jammy
144-
version:
145-
- "5.9"
146-
- "6.2"
142+
swift:
143+
- "5.9-jammy"
144+
- "6.2-noble"
147145
env:
148146
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
149147
steps:
@@ -179,10 +177,10 @@ jobs:
179177
path: |
180178
~/Library/Caches/org.swift.swiftpm
181179
~/.cache/org.swift.swiftpm
182-
key: 1-${{ runner.os }}-swift-${{ matrix.version }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
180+
key: 1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
183181
restore-keys: |
184-
1-${{ runner.os }}-swift-${{ matrix.version }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
185-
1-${{ runner.os }}-swift-${{ matrix.version }}-spm-
182+
1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
183+
1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-
186184
- name: Setup Java
187185
uses: actions/setup-java@v4
188186
with:

0 commit comments

Comments
 (0)