From cab53eaa80054d4334ac4016a7194cac4990005a Mon Sep 17 00:00:00 2001 From: Jonas Greifenhain Date: Tue, 6 Jan 2026 15:06:08 +0100 Subject: [PATCH 1/4] ci: Add Gradle cache --- .../composite_actions/install_dependencies/action.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/composite_actions/install_dependencies/action.yaml b/.github/composite_actions/install_dependencies/action.yaml index 846837d19e5..30c73db2cfa 100644 --- a/.github/composite_actions/install_dependencies/action.yaml +++ b/.github/composite_actions/install_dependencies/action.yaml @@ -12,6 +12,15 @@ inputs: runs: using: "composite" steps: + - name: Cache Gradle dependencies + uses: actions/cache@v4 + with: + path: | + ~/.gradle/caches/modules-2 + ~/.gradle/caches/metadata-* + ~/.gradle/wrapper + key: gradle-${{ runner.os }} + - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # 2.21.0 with: cache: true From afd23c61707f596d7f3498c766ca2c9fc3066098 Mon Sep 17 00:00:00 2001 From: Jonas Greifenhain Date: Tue, 6 Jan 2026 15:10:38 +0100 Subject: [PATCH 2/4] TMP --- .github/workflows/flutter_android.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/flutter_android.yaml b/.github/workflows/flutter_android.yaml index af7f1128823..bc2be463fbd 100644 --- a/.github/workflows/flutter_android.yaml +++ b/.github/workflows/flutter_android.yaml @@ -3,6 +3,7 @@ on: workflow_call: inputs: # Native code is tested through the example package. + #TMP trigger example-directory: description: The example directory, relative to the repo root required: true From d6880a80ee0f0b127203772cd015e698443dcb2d Mon Sep 17 00:00:00 2001 From: Jonas Greifenhain Date: Tue, 6 Jan 2026 15:11:32 +0100 Subject: [PATCH 3/4] TMP --- packages/amplify_core/lib/TMP | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/amplify_core/lib/TMP diff --git a/packages/amplify_core/lib/TMP b/packages/amplify_core/lib/TMP new file mode 100644 index 00000000000..e69de29bb2d From a2a04abac9e723f0c24b89a86badfd2a415cb084 Mon Sep 17 00:00:00 2001 From: Jonas Greifenhain Date: Tue, 6 Jan 2026 15:23:59 +0100 Subject: [PATCH 4/4] Test --- .../install_dependencies/action.yaml | 6 +++- .github/workflows/e2e_android.yaml | 18 ---------- .github/workflows/flutter_android.yaml | 33 ++++++++----------- .github/workflows/flutter_vm.yaml | 19 +---------- 4 files changed, 20 insertions(+), 56 deletions(-) diff --git a/.github/composite_actions/install_dependencies/action.yaml b/.github/composite_actions/install_dependencies/action.yaml index 30c73db2cfa..5be6a967a90 100644 --- a/.github/composite_actions/install_dependencies/action.yaml +++ b/.github/composite_actions/install_dependencies/action.yaml @@ -18,8 +18,12 @@ runs: path: | ~/.gradle/caches/modules-2 ~/.gradle/caches/metadata-* + ~/.gradle/caches/transforms-* + ~/.gradle/caches/jars-* ~/.gradle/wrapper - key: gradle-${{ runner.os }} + key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + gradle-${{ runner.os }}- - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # 2.21.0 with: diff --git a/.github/workflows/e2e_android.yaml b/.github/workflows/e2e_android.yaml index 9e7d15c5da1..642d684f392 100644 --- a/.github/workflows/e2e_android.yaml +++ b/.github/workflows/e2e_android.yaml @@ -70,21 +70,3 @@ jobs: with: api-level: ${{ matrix.api-level }} script: aft exec --include=${{ inputs.package-name }} -- small=true "/build-support/integ_test.sh" -d emulator-5554 --retries 1 - - - name: Log success/failure - if: always() - uses: ./.github/composite_actions/log_cw_metric_wrapper - with: - role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }} - aws-region: ${{ secrets.AWS_REGION }} - - job-status: ${{ job.status }} - github-token: ${{ secrets.GITHUB_TOKEN }} - - test-type: e2e - working-directory: ${{ inputs.working-directory }} - - framework: flutter - - platform: android - platform-version: android-${{ matrix.api-level }} diff --git a/.github/workflows/flutter_android.yaml b/.github/workflows/flutter_android.yaml index bc2be463fbd..fc20e09901d 100644 --- a/.github/workflows/flutter_android.yaml +++ b/.github/workflows/flutter_android.yaml @@ -32,6 +32,19 @@ jobs: exclude: - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }} steps: + - name: Cache Gradle dependencies + uses: actions/cache@v4 + with: + path: | + ~/.gradle/caches/modules-2 + ~/.gradle/caches/metadata-* + ~/.gradle/caches/transforms-* + ~/.gradle/caches/jars-* + ~/.gradle/wrapper + key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + gradle-${{ runner.os }}- + - name: Setup Java uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # 5.0.0 with: @@ -71,22 +84,4 @@ jobs: - name: Run Android unit tests if: inputs.has-native-tests run: ./gradlew :"${{ inputs.package-name }}":testDebugUnitTest --stacktrace - working-directory: ${{ inputs.example-directory }}/android - - - name: Log success/failure - if: always() - uses: ./.github/composite_actions/log_cw_metric_wrapper - with: - role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }} - aws-region: ${{ secrets.AWS_REGION }} - - job-status: ${{ job.status }} - github-token: ${{ secrets.GITHUB_TOKEN }} - - test-type: unit - working-directory: ${{ inputs.example-directory }} - - framework: flutter - flutter-dart-channel: ${{ matrix.channel }} - - platform: android + working-directory: ${{ inputs.example-directory }}/android \ No newline at end of file diff --git a/.github/workflows/flutter_vm.yaml b/.github/workflows/flutter_vm.yaml index 012137d3fc5..69cafff6cec 100644 --- a/.github/workflows/flutter_vm.yaml +++ b/.github/workflows/flutter_vm.yaml @@ -99,21 +99,4 @@ jobs: uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2 with: name: golden-failures-${{ matrix.channel }}-${{ matrix.flutter-version }} - path: ${{ inputs.working-directory }}/test/ui/failures/ - - - name: Log success/failure - if: always() - uses: ./.github/composite_actions/log_cw_metric_wrapper - with: - role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }} - aws-region: ${{ secrets.AWS_REGION }} - - job-status: ${{ job.status }} - github-token: ${{ secrets.GITHUB_TOKEN }} - - test-type: unit - working-directory: ${{ inputs.working-directory }} - - framework: flutter - flutter-dart-channel: ${{ matrix.channel }} - flutter-version: ${{ matrix.flutter-version }} + path: ${{ inputs.working-directory }}/test/ui/failures/ \ No newline at end of file