Skip to content

Commit

Permalink
fix: pin kotlin to 1.9.10 and do not test on macos-12 anymore (#2134)
Browse files Browse the repository at this point in the history
Co-authored-by: gxz <[email protected]>
  • Loading branch information
peilinok and guoxianzhe authored Dec 6, 2024
1 parent 1535e56 commit ec04bf4
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 19 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
fail-fast: false
matrix:
version: ["3.7.0", "3.16"]
runs-on: macos-12
runs-on: macos-latest
timeout-minutes: 120
env:
TEST_APP_ID: ${{ secrets.MY_APP_ID }}
Expand All @@ -136,7 +136,7 @@ jobs:
cache: true
- uses: futureware-tech/simulator-action@v3
with:
model: 'iPhone 14 Pro Max'
model: 'iPhone 15'
- run: bash ci/run_flutter_integration_test_ios.sh

integration_test_macos:
Expand All @@ -145,8 +145,8 @@ jobs:
strategy:
fail-fast: false
matrix:
version: ["3.7.0", "3.x"]
runs-on: macos-12
version: ["3.7.0"]
runs-on: macos-latest
timeout-minutes: 120
env:
TEST_APP_ID: ${{ secrets.MY_APP_ID }}
Expand Down Expand Up @@ -293,8 +293,8 @@ jobs:
strategy:
fail-fast: false
matrix:
version: ["3.7.0", "3.x"]
runs-on: macos-12
version: ["3.7.0"]
runs-on: macos-latest
timeout-minutes: 120
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -457,7 +457,7 @@ jobs:
--iris-ios-cdn-url=${IRIS_CDN_URL_IOS}
- uses: futureware-tech/simulator-action@v3
with:
model: 'iPhone 14 Pro Max'
model: 'iPhone 15'
- run: bash ci/rendering_test_ios.sh

- uses: actions/upload-artifact@v3
Expand All @@ -472,7 +472,7 @@ jobs:
strategy:
matrix:
version: ['3.x']
runs-on: macos-12
runs-on: macos-latest
timeout-minutes: 120
env:
TEST_APP_ID: ${{ secrets.MY_APP_ID }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/integration-test-iris-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
version: ['2.10.5', '3.0.0']
runs-on: macos-12
runs-on: macos-latest
timeout-minutes: 120
env:
TEST_APP_ID: ${{ secrets.MY_APP_ID }}
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
strategy:
matrix:
version: ['2.10.5', '3.0.0']
runs-on: macos-12
runs-on: macos-latest
timeout-minutes: 120
env:
TEST_APP_ID: ${{ secrets.MY_APP_ID }}
Expand All @@ -85,9 +85,9 @@ jobs:
with:
flutter-version: ${{ matrix.version }}
cache: true
- uses: futureware-tech/simulator-action@v1
- uses: futureware-tech/simulator-action@v3
with:
model: 'iPhone 13 Pro Max'
model: 'iPhone 15'
- name: Checkout hoe
uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
strategy:
matrix:
version: ['2.10.5', '3.0.0']
runs-on: macos-12
runs-on: macos-latest
timeout-minutes: 120
env:
TEST_APP_ID: ${{ secrets.MY_APP_ID }}
Expand Down
2 changes: 1 addition & 1 deletion example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
// Min kotlin version for Flutter SDK 3.24
ext.kotlin_version = '1.7.0'
ext.kotlin_version = '1.9.10'
repositories {
google()
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion test_shard/fake_test_app/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
// Min kotlin version for Flutter SDK 3.24
ext.kotlin_version = '1.7.0'
ext.kotlin_version = '1.9.10'
repositories {
google()
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion test_shard/integration_test_app/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
// Min kotlin version for Flutter SDK 3.24
ext.kotlin_version = '1.7.0'
ext.kotlin_version = '1.9.10'
repositories {
google()
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion test_shard/iris_tester/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version '1.0-SNAPSHOT'

buildscript {
// Min kotlin version for Flutter SDK 3.24
ext.kotlin_version = '1.7.0'
ext.kotlin_version = '1.9.10'
repositories {
google()
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion test_shard/iris_tester/example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
// Min kotlin version for Flutter SDK 3.24
ext.kotlin_version = '1.7.0'
ext.kotlin_version = '1.9.10'
repositories {
google()
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion test_shard/rendering_test/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
// Min kotlin version for Flutter SDK 3.24
ext.kotlin_version = '1.7.0'
ext.kotlin_version = '1.9.10'
repositories {
google()
mavenCentral()
Expand Down

0 comments on commit ec04bf4

Please sign in to comment.