From 85768674169757dc1e93da9fc76957dd303027aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Stormacq?= Date: Thu, 6 Mar 2025 18:30:46 +0100 Subject: [PATCH 1/2] use ALI2 for integration tests --- .github/workflows/integration_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index af02f0d4..b9c09537 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -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: From b386f72dcd0704c1ed9ae6eaa8b49c1e945ae2a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Stormacq?= Date: Thu, 6 Mar 2025 18:44:02 +0100 Subject: [PATCH 2/2] remove unnecessary ENV vraiable SWIFT_VERSION --- .github/workflows/integration_tests.yml | 2 -- .github/workflows/scripts/integration_tests.sh | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index b9c09537..422ef82e 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -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: @@ -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: | diff --git a/.github/workflows/scripts/integration_tests.sh b/.github/workflows/scripts/integration_tests.sh index cb0e031b..8d11b313 100755 --- a/.github/workflows/scripts/integration_tests.sh +++ b/.github/workflows/scripts/integration_tests.sh @@ -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"