Skip to content

Commit 8f10a6b

Browse files
authored
Fix CI error on Amazon S3 examples (#496)
When we include Traits, we changed the CI container from Swift 6.0 Amazon Linux to Swift 6.1 Nightly on Ubuntu. This broke the CI because AWS SDK used in the `Examples/S3_AWSSDK` example depends on `libssl-devel` which is not installed by default on Jammy images. This PR reverts back the container used to test all examples to an Amazon Linux 2, but this time the 6.1-nightly version to allow to compile the package traits. This should address #494
1 parent bba711b commit 8f10a6b

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Diff for: .github/workflows/integration_tests.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ on:
3838
required: true
3939
matrix_linux_swift_container_image:
4040
type: string
41-
description: "Container image for the matrix job. Defaults to matching latest Swift Ubuntu image."
42-
default: "swiftlang/swift:nightly-6.1-jammy"
41+
description: "Container image for the matrix job. Defaults to matching latest Swift 6.1 Amazon Linux 2 image."
42+
default: "swiftlang/swift:nightly-6.1-amazonlinux2"
4343

4444
## We are cancelling previously triggered workflow runs
4545
concurrency:
@@ -59,7 +59,6 @@ jobs:
5959
# We are using only one Swift version
6060
swift:
6161
- image: ${{ inputs.matrix_linux_swift_container_image }}
62-
swift_version: "6.0.3-amazonlinux2"
6362
container:
6463
image: ${{ matrix.swift.image }}
6564
steps:
@@ -93,7 +92,6 @@ jobs:
9392
- name: Run matrix job
9493
working-directory: ${{ github.event.repository.name }} # until we can use action/checkout@v4
9594
env:
96-
SWIFT_VERSION: ${{ matrix.swift.swift_version }}
9795
COMMAND: ${{ inputs.matrix_linux_command }}
9896
EXAMPLE: ${{ matrix.examples }}
9997
run: |

Diff for: .github/workflows/scripts/integration_tests.sh

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ log() { printf -- "** %s\n" "$*" >&2; }
1919
error() { printf -- "** ERROR: %s\n" "$*" >&2; }
2020
fatal() { error "$@"; exit 1; }
2121

22+
SWIFT_VERSION=$(swift --version)
2223
test -n "${SWIFT_VERSION:-}" || fatal "SWIFT_VERSION unset"
2324
test -n "${COMMAND:-}" || fatal "COMMAND unset"
2425
test -n "${EXAMPLE:-}" || fatal "EXAMPLE unset"

0 commit comments

Comments
 (0)