Skip to content

Bump minimum Swift version to 5.9 #338

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.

Sign up for GitHub

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
waahm7 merged 5 commits into from
May 8, 2025
Merged

Bump minimum Swift version to 5.9 #338

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0bf85dd
bump minimum Swift version to 5.9
waahm7 May 2, 2025
51fae98
format
waahm7 May 2, 2025
3d6bc86
Use required checks trick from Rust. Makes it easier to bump macos ve…
waahm7 May 2, 2025
d6e4130
revert builder
waahm7 May 6, 2025
89cbcf0
typo
waahm7 May 6, 2025
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
71 changes: 31 additions & 40 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ on:
- 'main'

env:
BUILDER_VERSION: v0.9.77
BUILDER_SOURCE: releases
BUILDER_VERSION: bump-swift-5.9
Copy link
Contributor

@DmitriyMusatkin DmitriyMusatkin May 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dont forget to switch

BUILDER_SOURCE: channels
BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
PACKAGE_NAME: aws-crt-swift
RUN: ${{ github.run_id }}-${{ github.run_number }}
Expand Down Expand Up @@ -39,12 +39,12 @@ jobs:
- uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ env.CRT_CI_ROLE }}
aws-region: ${{ env.AWS_DEFAULT_REGION }}
aws-region: ${{ env.AWS_DEFAULT_REGION }}
- name: Build ${{ env.PACKAGE_NAME }}
run: |
aws s3 cp --debug s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-swift-5-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }}

macos:
runs-on: ${{ matrix.runner }}
env:
Expand All @@ -56,15 +56,15 @@ jobs:
matrix:
# This matrix runs tests on Mac, on oldest & newest supported Xcodes
runner:
- macos-13 # x64
- macos-14
- macos-13-xlarge
- macos-14-large #x64
- macos-15
- macos-15-large # x64
steps:
- uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ env.CRT_CI_ROLE }}
aws-region: ${{ env.AWS_DEFAULT_REGION }}
aws-region: ${{ env.AWS_DEFAULT_REGION }}
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
Expand All @@ -84,7 +84,7 @@ jobs:
- uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ env.CRT_CI_ROLE }}
aws-region: ${{ env.AWS_DEFAULT_REGION }}
aws-region: ${{ env.AWS_DEFAULT_REGION }}
- name: Checkout repository
uses: actions/checkout@v4
with:
Expand All @@ -93,7 +93,7 @@ jobs:
- name: Set Swift version to 6
run: |
sed -i '' 's/swift-tools-version:5\.[0-9][0-9]*/swift-tools-version:6\.0/' Package.swift
# Verify that substitution was successful
# Verify that substitution was successful
grep -q 'swift-tools-version:6\.0' Package.swift || (echo "No version 5.x found to update" && exit 1)
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
Expand All @@ -109,50 +109,41 @@ jobs:
strategy:
fail-fast: false
matrix:
# This matrix runs tests on iOS and tvOS on oldest & newest supported Xcodes
# This matrix runs tests on iOS and tvOS on oldest & newest supported Xcodes.
# Copied from https://github.com/awslabs/aws-sdk-swift/blob/main/.github/workflows/integration-test.yml
runner:
- macos-13 # x64
- macos-14
- macos-13-xlarge
- macos-14-large #x64
target:
[{ os: ios, destination: 'iOS Simulator,OS=16.1,name=iPhone 14'},
{ os: ios, destination: 'iOS Simulator,OS=17.2,name=iPhone 15'},
{ os: tvos, destination: 'tvOS Simulator,OS=16.1,name=Apple TV 4K (3rd generation) (at 1080p)'},
{ os: tvos, destination: 'tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'}]
- macos-15
xcode:
- Xcode_14.1
- Xcode_15.2
- Xcode_16.1
target:
[{ os: ios, destination: 'iOS Simulator,OS=17.2,name=iPhone 15'},
{ os: ios, destination: 'iOS Simulator,OS=18.1,name=iPhone 16'},
{ os: tvos, destination: 'tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'},
{ os: tvos, destination: 'tvOS Simulator,OS=18.1,name=Apple TV 4K (3rd generation) (at 1080p)'}]
exclude:
# Don't run old macOS with new Xcode
- runner: macos-13-xlarge
xcode: Xcode_15.2
- runner: macos-13
xcode: Xcode_15.2
- runner: macos-13-xlarge
target: { os: ios, destination: 'iOS Simulator,OS=16.1,name=iPhone 14'}
- runner: macos-13
target: { os: ios, destination: 'iOS Simulator,OS=16.1,name=iPhone 14'}
# Don't run new macOS with old Xcode
- runner: macos-14-large
xcode: Xcode_14.1
- runner: macos-14
xcode: Xcode_14.1
xcode: Xcode_16.1
# Don't run new macOS with old Xcode
- runner: macos-15
xcode: Xcode_15.2
# Don't run old simulators with new Xcode
- target: { os: tvos, destination: 'tvOS Simulator,OS=16.1,name=Apple TV 4K (3rd generation) (at 1080p)'}
- target: { os: tvos, destination: 'tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)' }
xcode: Xcode_16.1
- target: { os: ios, destination: 'iOS Simulator,OS=17.2,name=iPhone 15' }
xcode: Xcode_16.1
# Don't run new simulators with old Xcode
- target: { os: tvos, destination: 'tvOS Simulator,OS=18.1,name=Apple TV 4K (3rd generation) (at 1080p)' }
xcode: Xcode_15.2
- target: { os: ios, destination: 'iOS Simulator,OS=16.1,name=iPhone 14'}
- target: { os: ios, destination: 'iOS Simulator,OS=18.1,name=iPhone 16' }
xcode: Xcode_15.2
# Don't run new simulators with old Xcode
- target: { os: tvos, destination: 'tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'}
xcode: Xcode_14.1
- target: { os: ios, destination: 'iOS Simulator,OS=17.2,name=iPhone 15'}
xcode: Xcode_14.1
steps:
- uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ env.CRT_CI_ROLE }}
aws-region: ${{ env.AWS_DEFAULT_REGION }}
aws-region: ${{ env.AWS_DEFAULT_REGION }}
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
Expand All @@ -165,7 +156,7 @@ jobs:
- uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ env.CRT_CI_ROLE }}
aws-region: ${{ env.AWS_DEFAULT_REGION }}
aws-region: ${{ env.AWS_DEFAULT_REGION }}
- name: Checkout Source
uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.7
// swift-tools-version:5.9
import PackageDescription

let excludesFromAll = ["tests", "cmake", "CONTRIBUTING.md",
Expand Down
Loading