Skip to content

Fix CI error on Amazon S3 examples #496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ on:
required: true
matrix_linux_swift_container_image:
type: string
description: "Container image for the matrix job. Defaults to matching latest Swift Ubuntu image."
default: "swiftlang/swift:nightly-6.1-jammy"
description: "Container image for the matrix job. Defaults to matching latest Swift 6.1 Amazon Linux 2 image."
default: "swiftlang/swift:nightly-6.1-amazonlinux2"

## We are cancelling previously triggered workflow runs
concurrency:
Expand All @@ -59,7 +59,6 @@ jobs:
# We are using only one Swift version
swift:
- image: ${{ inputs.matrix_linux_swift_container_image }}
swift_version: "6.0.3-amazonlinux2"
container:
image: ${{ matrix.swift.image }}
steps:
Expand Down Expand Up @@ -93,7 +92,6 @@ jobs:
- name: Run matrix job
working-directory: ${{ github.event.repository.name }} # until we can use action/checkout@v4
env:
SWIFT_VERSION: ${{ matrix.swift.swift_version }}
COMMAND: ${{ inputs.matrix_linux_command }}
EXAMPLE: ${{ matrix.examples }}
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/scripts/integration_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ log() { printf -- "** %s\n" "$*" >&2; }
error() { printf -- "** ERROR: %s\n" "$*" >&2; }
fatal() { error "$@"; exit 1; }

SWIFT_VERSION=$(swift --version)
test -n "${SWIFT_VERSION:-}" || fatal "SWIFT_VERSION unset"
test -n "${COMMAND:-}" || fatal "COMMAND unset"
test -n "${EXAMPLE:-}" || fatal "EXAMPLE unset"
Expand Down