From f1f50897e76971ed29c3ef7fead08912ec798269 Mon Sep 17 00:00:00 2001 From: yuoohama Date: Thu, 3 Aug 2023 15:20:52 +0900 Subject: [PATCH 1/6] Update ci.yml --- .github/workflows/ci.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9383d5e..5ea346b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,11 +56,6 @@ jobs: path: /opt/hostedtoolcache/Flutter key: ${{ runner.os }}-flutter-${{ hashFiles('**/flutter/bin/cache/**') }}-${{ github.run_id }} - - name: Setup Flutter SDK - uses: subosito/flutter-action@v2 - with: - channel: beta - - name: Cache Flutter packages uses: actions/cache@v3 with: @@ -115,11 +110,6 @@ jobs: path: /opt/hostedtoolcache/Flutter key: ${{ runner.os }}-flutter-${{ hashFiles('**/flutter/bin/cache/**') }}-${{ github.run_id }} - - name: Setup Flutter SDK - uses: subosito/flutter-action@v2 - with: - channel: beta - - name: Cache Flutter packages uses: actions/cache@v3 with: From 0092db888de51a75463e4da6fcdeed481dc58d1b Mon Sep 17 00:00:00 2001 From: yuoohama Date: Thu, 3 Aug 2023 15:48:30 +0900 Subject: [PATCH 2/6] Update ci.yml --- .github/workflows/ci.yml | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ea346b3..dc4eba64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,37 +11,8 @@ jobs: uses: styfle/cancel-workflow-action@0.11.0 with: access_token: ${{ github.token }} - setup: - runs-on: macos-latest - steps: - - name: Check out - uses: actions/checkout@v3 - - - name: Setup Flutter SDK - uses: subosito/flutter-action@v2 - with: - channel: beta - - - name: Cache Flutter SDK - uses: actions/cache@v3 - with: - path: /opt/hostedtoolcache/Flutter - key: ${{ runner.os }}-flutter-${{ hashFiles('**/flutter/bin/cache/**') }}-${{ github.run_id }} - - - name: Cache Flutter packages - uses: actions/cache@v3 - with: - path: ~/.pub-cache - key: ${{ runner.os }}-pub-${{ hashFiles('**/pubspec.lock') }}-${{ github.run_id }} - - - name: Install packages - run: flutter --disable-telemetry && flutter clean && flutter pub get - - - name: Analyze - run: flutter analyze ios: - needs: setup timeout-minutes: 60 strategy: fail-fast: true @@ -56,6 +27,11 @@ jobs: path: /opt/hostedtoolcache/Flutter key: ${{ runner.os }}-flutter-${{ hashFiles('**/flutter/bin/cache/**') }}-${{ github.run_id }} + - name: Setup Flutter SDK + uses: subosito/flutter-action@v2 + with: + channel: beta + - name: Cache Flutter packages uses: actions/cache@v3 with: @@ -93,7 +69,6 @@ jobs: flutter test integration_test/integration_test.dart --timeout none android: - needs: setup timeout-minutes: 60 runs-on: macos-latest strategy: @@ -110,6 +85,11 @@ jobs: path: /opt/hostedtoolcache/Flutter key: ${{ runner.os }}-flutter-${{ hashFiles('**/flutter/bin/cache/**') }}-${{ github.run_id }} + - name: Setup Flutter SDK + uses: subosito/flutter-action@v2 + with: + channel: beta + - name: Cache Flutter packages uses: actions/cache@v3 with: From 9e47e214dfc014fda03d8ff05de09ac2a32867e1 Mon Sep 17 00:00:00 2001 From: yuoohama Date: Thu, 3 Aug 2023 16:02:20 +0900 Subject: [PATCH 3/6] Update ci.yml --- .github/workflows/ci.yml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc4eba64..124adbbe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,23 +21,11 @@ jobs: - name: Check out uses: actions/checkout@v3 - - name: Cache Flutter SDK - uses: actions/cache@v3 - with: - path: /opt/hostedtoolcache/Flutter - key: ${{ runner.os }}-flutter-${{ hashFiles('**/flutter/bin/cache/**') }}-${{ github.run_id }} - - name: Setup Flutter SDK uses: subosito/flutter-action@v2 with: channel: beta - - name: Cache Flutter packages - uses: actions/cache@v3 - with: - path: ~/.pub-cache - key: ${{ runner.os }}-pub-${{ hashFiles('**/pubspec.lock') }}-${{ github.run_id }} - - name: Install Flutter dependencies run: flutter pub get ./example @@ -79,23 +67,11 @@ jobs: - name: Check out uses: actions/checkout@v3 - - name: Cache Flutter SDK - uses: actions/cache@v3 - with: - path: /opt/hostedtoolcache/Flutter - key: ${{ runner.os }}-flutter-${{ hashFiles('**/flutter/bin/cache/**') }}-${{ github.run_id }} - - name: Setup Flutter SDK uses: subosito/flutter-action@v2 with: channel: beta - - name: Cache Flutter packages - uses: actions/cache@v3 - with: - path: ~/.pub-cache - key: ${{ runner.os }}-pub-${{ hashFiles('**/pubspec.lock') }}-${{ github.run_id }} - - name: Install Flutter dependencies run: flutter pub get ./example From c2c4020f31aab057165022c1ea0416f9cee331fa Mon Sep 17 00:00:00 2001 From: yuoohama Date: Thu, 3 Aug 2023 16:32:02 +0900 Subject: [PATCH 4/6] Update ci.yml --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 124adbbe..9bc577c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: push: jobs: - cancel-outdated-runs: + set-up: runs-on: ubuntu-latest steps: - name: Cancel @@ -13,6 +13,7 @@ jobs: access_token: ${{ github.token }} ios: + needs: set-up timeout-minutes: 60 strategy: fail-fast: true @@ -57,6 +58,7 @@ jobs: flutter test integration_test/integration_test.dart --timeout none android: + needs: set-up timeout-minutes: 60 runs-on: macos-latest strategy: From 575b4bd9e4969c214e808ba0118fff1d63b919b7 Mon Sep 17 00:00:00 2001 From: yuoohama Date: Thu, 3 Aug 2023 17:04:47 +0900 Subject: [PATCH 5/6] Update ci.yml --- .github/workflows/ci.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9bc577c5..4f58f871 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: ios: needs: set-up - timeout-minutes: 60 + timeout-minutes: 30 strategy: fail-fast: true runs-on: macos-latest @@ -35,7 +35,7 @@ jobs: model: iPhone 14 Pro Max - name: Build - timeout-minutes: 20 + timeout-minutes: 10 run: | cd example flutter build ios --simulator --target=integration_test/integration_test.dart @@ -59,7 +59,7 @@ jobs: android: needs: set-up - timeout-minutes: 60 + timeout-minutes: 30 runs-on: macos-latest strategy: matrix: @@ -99,7 +99,7 @@ jobs: with: api-level: ${{ matrix.api-level }} arch: x86_64 - emulator-boot-timeout: 600 + emulator-boot-timeout: 300 force-avd-creation: false sdcard-path-or-size: ${{ matrix.api-level <= 23 && '10M' || null }} emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -camera-front none @@ -113,13 +113,12 @@ jobs: api-level: ${{ matrix.api-level }} working-directory: ./example arch: x86_64 - emulator-boot-timeout: 300 + emulator-boot-timeout: 120 force-avd-creation: false sdcard-path-or-size: ${{ matrix.api-level <= 23 && '10M' || null }} emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -camera-front none script: | if [ ${{ matrix.api-level }} -le 29 ]; then flutter build apk --debug; adb install -r build/app/outputs/flutter-apk/app-debug.apk; adb shell pm grant studio.midoridesign.gal_example android.permission.WRITE_EXTERNAL_STORAGE; fi - if [ ${{ matrix.api-level }} -le 23 ]; then adb shell pm grant studio.midoridesign.gal_example android.permission.READ_EXTERNAL_STORAGE; fi flutter test integration_test/integration_test.dart --timeout none - name: Retry integration tests @@ -129,7 +128,7 @@ jobs: api-level: ${{ matrix.api-level }} working-directory: ./example arch: x86_64 - emulator-boot-timeout: 600 + emulator-boot-timeout: 300 force-avd-creation: false sdcard-path-or-size: ${{ matrix.api-level <= 23 && '10M' || null }} emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -camera-front none @@ -139,5 +138,4 @@ jobs: script: | flutter clean && flutter pub get if [ ${{ matrix.api-level }} -le 29 ]; then flutter build apk --debug; adb install -r build/app/outputs/flutter-apk/app-debug.apk; adb shell pm grant studio.midoridesign.gal_example android.permission.WRITE_EXTERNAL_STORAGE; fi - if [ ${{ matrix.api-level }} -le 23 ]; then adb shell pm grant studio.midoridesign.gal_example android.permission.READ_EXTERNAL_STORAGE; fi flutter test integration_test/integration_test.dart --timeout none \ No newline at end of file From 15ec045692e85d7ed39e0e14a66a7d75403f79aa Mon Sep 17 00:00:00 2001 From: yuoohama Date: Thu, 3 Aug 2023 17:50:32 +0900 Subject: [PATCH 6/6] Update AndroidManifest.xml --- example/android/app/src/main/AndroidManifest.xml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 5b2a1048..2b10eb79 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -24,16 +24,11 @@ android:name="flutterEmbedding" android:value="2" /> + - - - - - - +