Skip to content

Commit 4effe30

Browse files
authored
chore: kickoff release
2 parents 6c73bf7 + 8a1b353 commit 4effe30

File tree

53 files changed

+365
-606
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+365
-606
lines changed

.codecov.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ codecov:
33

44
coverage:
55
status:
6+
patch: off
67
project:
78
default:
89
threshold: 1%

.github/composite_actions/get_platform_parameters/action.yml

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ outputs:
1717
destination:
1818
description: "The destination associated with the given platform and Xcode version"
1919
value: ${{ steps.get-destination.outputs.destination }}
20+
device:
21+
description: "The device name used in the destination"
22+
value: ${{ steps.get-destination.outputs.device }}
2023
sdk:
2124
description: "The SDK associated with the given platform"
2225
value: ${{ steps.get-sdk.outputs.sdk }}
@@ -38,23 +41,16 @@ runs:
3841

3942
- id: get-xcode-version
4043
run: |
41-
LATEST_XCODE_VERSION=14.3.1
42-
MINIMUM_XCODE_VERSION_IOS_MAC=14.1.0
43-
MINIMUM_XCODE_VERSION_WATCH_TV=14.3.1
44+
LATEST_XCODE_VERSION=15.3.0
45+
MINIMUM_XCODE_VERSION=15.0.1
4446
4547
INPUT_XCODE_VERSION=${{ inputs.xcode_version }}
4648
4749
case $INPUT_XCODE_VERSION in
4850
latest)
4951
XCODE_VERSION=$LATEST_XCODE_VERSION ;;
5052
minimum)
51-
INPUT_PLATFORM=${{ inputs.platform }}
52-
case $INPUT_PLATFORM in
53-
iOS|macOS)
54-
XCODE_VERSION=$MINIMUM_XCODE_VERSION_IOS_MAC ;;
55-
tvOS|watchOS)
56-
XCODE_VERSION=$MINIMUM_XCODE_VERSION_WATCH_TV ;;
57-
esac ;;
53+
XCODE_VERSION=$MINIMUM_XCODE_VERSION ;;
5854
*)
5955
XCODE_VERSION=$INPUT_XCODE_VERSION ;;
6056
esac
@@ -68,23 +64,42 @@ runs:
6864
INPUT_DESTINATION='${{ inputs.destination }}'
6965
INPUT_XCODE_VERSION=${{ inputs.xcode_version }}
7066
71-
DESTINATION_MAPPING='{
72-
"minimum": {
73-
"iOS": "platform=iOS Simulator,name=iPhone 14,OS=16.1",
74-
"tvOS": "platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=16.1",
75-
"watchOS": "platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=9.1",
76-
"macOS": "platform=macOS,arch=x86_64"
77-
},
78-
"latest": {
79-
"iOS": "platform=iOS Simulator,name=iPhone 14,OS=16.4",
80-
"tvOS": "platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=16.4",
81-
"watchOS": "platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=9.4",
82-
"macOS": "platform=macOS,arch=x86_64"
83-
}
84-
}'
67+
case $INPUT_PLATFORM/$INPUT_XCODE_VERSION in
68+
iOS/latest)
69+
DEVICE="iPhone 15"
70+
OS_VERSION="17.4"
71+
;;
72+
iOS/*)
73+
DEVICE="iPhone 14"
74+
OS_VERSION="17.0.1"
75+
;;
76+
tvOS/latest)
77+
DEVICE="Apple TV 4K (3rd generation)"
78+
OS_VERSION="17.4"
79+
;;
80+
tvOS/*)
81+
DEVICE="Apple TV 4K (3rd generation)"
82+
OS_VERSION="17.0"
83+
;;
84+
watchOS/latest)
85+
DEVICE="Apple Watch Series 9 (45mm)"
86+
OS_VERSION="10.4"
87+
;;
88+
watchOS/*)
89+
DEVICE="Apple Watch Series 8 (45mm)"
90+
OS_VERSION="10.0"
91+
;;
92+
esac
93+
94+
DESTINATION_MAPPING="{
95+
\"iOS\": \"platform=iOS Simulator,name=$DEVICE,OS=$OS_VERSION\",
96+
\"tvOS\": \"platform=tvOS Simulator,name=$DEVICE,OS=$OS_VERSION\",
97+
\"watchOS\": \"platform=watchOS Simulator,name=$DEVICE,OS=$OS_VERSION\",
98+
\"macOS\": \"platform=macOS,arch=arm64\"
99+
}"
85100
86101
if [ -z "$INPUT_DESTINATION" ]; then
87-
DESTINATION=$(echo $DESTINATION_MAPPING | jq -r ".\"$INPUT_XCODE_VERSION\".$INPUT_PLATFORM")
102+
DESTINATION=$(echo $DESTINATION_MAPPING | jq -r ".$INPUT_PLATFORM")
88103
else
89104
DESTINATION=$INPUT_DESTINATION
90105
fi
@@ -94,6 +109,7 @@ runs:
94109
exit 1
95110
fi
96111
echo "destination=$DESTINATION" >> $GITHUB_OUTPUT
112+
echo "device=$DEVICE" >> $GITHUB_OUTPUT
97113
shell: bash
98114

99115
- id: get-sdk

.github/workflows/build_minimum_supported_swift_platforms.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: ./.github/workflows/build_scheme.yml
2828
with:
2929
scheme: Amplify-Build
30-
os-runner: ${{ (matrix.platform == 'tvOS' || matrix.platform == 'watchOS') && 'macos-13' || 'macos-12' }}
30+
os-runner: 'macos-latest'
3131
xcode-version: 'minimum'
3232
platform: ${{ matrix.platform }}
3333
save_build_cache: false

.github/workflows/build_scheme.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616

1717
os-runner:
1818
type: string
19-
default: 'macos-13'
19+
default: 'macos-latest'
2020

2121
save_build_cache:
2222
type: boolean

.github/workflows/canary.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
strategy:
1616
matrix:
1717
include:
18-
- os: macos-13
19-
xcode-version: 14.3.1
20-
device: iPhone 14 Pro
21-
version: 16.4
22-
- os: macos-12
23-
xcode-version: 14.1
24-
device: iPhone 13 Pro
25-
version: 16.1
18+
- os: macos-latest
19+
xcode-version: 15.3.0
20+
device: iPhone 15
21+
version: 17.4
22+
- os: macos-latest
23+
xcode-version: 15.0.1
24+
device: iPhone 14
25+
version: 17.0.1
2626
name: Canary Test - Xcode ${{ matrix.xcode-version }}
2727
runs-on: ${{ matrix.os }}
2828
steps:
@@ -39,7 +39,7 @@ jobs:
3939
run: amplify init --quickstart --frontend ios
4040

4141
- name: Setup Ruby
42-
uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0
42+
uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0
4343
with:
4444
ruby-version: '3.2.1'
4545
bundler-cache: true

.github/workflows/integ_test_push_notifications.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ permissions:
2626
jobs:
2727
push-notification-integration-tests:
2828
name: ${{ matrix.platform }} Tests | PushNotificationHostApp
29-
runs-on: macos-13
29+
runs-on: macos-latest
3030
timeout-minutes: 30
3131
environment: IntegrationTest
3232
strategy:

.github/workflows/release_kickoff.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Creates a PR to push main to release branch to kick-off the release workflow
2-
name: Release Amplify iOS
2+
name: Release Amplify iOS
33

44
on:
55
workflow_dispatch:
@@ -10,7 +10,7 @@ permissions:
1010
jobs:
1111
release:
1212
name: Release
13-
runs-on: macos-12
13+
runs-on: macos-latest
1414

1515
steps:
1616
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1

.github/workflows/run_integration_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
inputs:
55
os-runner:
66
type: string
7-
default: 'macos-13'
7+
default: 'macos-latest'
88
scheme:
99
description: 'The scheme to run the tests'
1010
required: true
@@ -17,7 +17,7 @@ on:
1717
required: false
1818
type: string
1919
xcode_version:
20-
description: 'The verion of Xcode used to run these tests'
20+
description: 'The version of Xcode used to run these tests'
2121
default: 'latest'
2222
type: string
2323
destination:

.github/workflows/run_unit_tests.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,17 @@ on:
3232
required: false
3333
type: string
3434
default: '-test-iterations 3 -retry-tests-on-failure'
35+
os-runner:
36+
description: 'runs-on input'
37+
type: string
3538

3639
permissions:
3740
contents: read
3841

3942
jobs:
4043
unit-tests:
4144
name: ${{ inputs.platform }} Tests | ${{ inputs.scheme }}
42-
runs-on: macos-13
45+
runs-on: ${{ inputs.os-runner }}
4346
timeout-minutes: ${{ inputs.timeout-minutes }}
4447
steps:
4548
- name: Checkout repository

.github/workflows/run_unit_tests_platforms.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ on:
2121
required: false
2222
type: string
2323
default: '-test-iterations 3 -retry-tests-on-failure'
24+
os-runner:
25+
description: 'runs-on input'
26+
type: string
27+
default: 'macos-latest'
2428

2529
permissions:
2630
contents: read
@@ -43,4 +47,5 @@ jobs:
4347
platform: ${{ matrix.platform }}
4448
generate_coverage_report: ${{ github.event_name != 'workflow_dispatch' && matrix.platform == 'iOS' && inputs.generate_coverage_report }}
4549
timeout-minutes: ${{ inputs.timeout-minutes }}
46-
test_iterations_flags: ${{ inputs.test_iterations_flags }}
50+
test_iterations_flags: ${{ inputs.test_iterations_flags }}
51+
os-runner: ${{ inputs.os-runner }}

0 commit comments

Comments
 (0)