From f4ef35fa9a886871c265bcf6d7d2de689d7746c3 Mon Sep 17 00:00:00 2001 From: "verified-commit[bot]" <180343340+verified-commit[bot]@users.noreply.github.com> Date: Wed, 12 Nov 2025 22:37:05 +0100 Subject: [PATCH] chore(release): upgrade flutter to 3.38.0 (#397) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: verified-commit[bot] <180343340+verified-commit[bot]@users.noreply.github.com> Co-authored-by: Eligio Mariño <22875166+gmeligio@users.noreply.github.com> --- .github/workflows/update_version.yml | 22 ++++++++++++++++++++-- config/flutter_version.json | 4 ++-- config/version.json | 8 ++++---- readme.md | 26 +++++++++++++------------- test/android.yml | 2 +- 5 files changed, 40 insertions(+), 22 deletions(-) diff --git a/.github/workflows/update_version.yml b/.github/workflows/update_version.yml index c615c57..4f118dd 100644 --- a/.github/workflows/update_version.yml +++ b/.github/workflows/update_version.yml @@ -62,6 +62,7 @@ jobs: if: ${{ needs.update_flutter_version.outputs.new_version == 'true' }} outputs: version_artifact_id: ${{ steps.upload-version.outputs.artifact-id }} + android_test_artifact_id: ${{ steps.upload-android-test.outputs.artifact-id }} runs-on: ubuntu-24.04 container: image: ghcr.io/${{ github.repository_owner }}/flutter-android:${{ vars.FLUTTER_VERSION }} @@ -121,6 +122,10 @@ jobs: run: | rm -rf test_app + - name: Generate test files with CUE + run: | + ./script/update_test.sh + - name: Upload artifact with the updated version.json id: upload-version uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 @@ -128,6 +133,13 @@ jobs: name: version.json path: config/version.json + - name: Upload the test artifact for Android + id: upload-android-test + uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 + with: + name: android.yml + path: test/android.yml + validate_config_version: needs: update_android_version runs-on: ubuntu-24.04 @@ -177,9 +189,9 @@ jobs: # https://github.com/actions/download-artifact/issues/138 - name: Delete flutter_version.json and version.json run: |- - rm config/flutter_version.json config/version.json + rm config/flutter_version.json config/version.json test/android.yml - - name: Download artifact with the new Flutter version + - name: Download configuration artifacts uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0 with: artifact-ids: ${{ needs.update_flutter_version.outputs.flutter_version_artifact_id }},${{ needs.update_android_version.outputs.version_artifact_id }} @@ -187,6 +199,12 @@ jobs: # Download to the configured path instead of separated directories by artifact id merge-multiple: true + - name: Download test artifacts + uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0 + with: + artifact-ids: ${{ needs.update_android_version.outputs.android_test_artifact_id }} + path: test + - name: Setup NodeJS uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: diff --git a/config/flutter_version.json b/config/flutter_version.json index ddb05ec..0053c05 100644 --- a/config/flutter_version.json +++ b/config/flutter_version.json @@ -1,7 +1,7 @@ { "flutter": { "channel": "stable", - "commit": "adc901062556672b4138e18a4dc62a4be8f4b3c2", - "version": "3.35.7" + "commit": "a0e9b9dbf78c8a5ef39b45a7efd40ed2de19c1a7", + "version": "3.38.0" } } diff --git a/config/version.json b/config/version.json index 68325d3..487bceb 100644 --- a/config/version.json +++ b/config/version.json @@ -1,8 +1,8 @@ { "flutter": { "channel": "stable", - "commit": "adc901062556672b4138e18a4dc62a4be8f4b3c2", - "version": "3.35.7" + "commit": "a0e9b9dbf78c8a5ef39b45a7efd40ed2de19c1a7", + "version": "3.38.0" }, "android": { "platforms": [ @@ -11,7 +11,7 @@ } ], "gradle": { - "version": "8.12" + "version": "8.14" }, "buildTools": { "version": "35.0.0" @@ -20,7 +20,7 @@ "version": "19.0" }, "ndk": { - "version": "27.0.12077973" + "version": "28.2.13676358" }, "cmake": { "version": "3.22.1" diff --git a/readme.md b/readme.md index 5528eb7..e715616 100644 --- a/readme.md +++ b/readme.md @@ -23,7 +23,7 @@ The images includes the minimum tools to run Flutter and build apps. The version ## Features -* Installed Flutter SDK 3.35.7. +* Installed Flutter SDK 3.38.0. * Analytics disabled by default, opt-in if `ENABLE_ANALYTICS` environment variable is passed when running the container. * Rootless user `flutter:flutter`, with permissions to run on Github workflows and GitLab CI. * Cached Fastlane gem 2.228.0. @@ -33,22 +33,22 @@ Predownloaded SDKs and tools in Android: * Licenses accepted * Android SDK Platforms: 36 -* Android NDK: 27.0.12077973 -* Gradle: 8.12 +* Android NDK: 28.2.13676358 +* Gradle: 8.14 ## Running Containers | Registry | flutter-android | | ------------------------- | -------------------------------------------------------------------------------------------------------------------------- | -| Docker Hub | [gmeligio/flutter-android:3.35.7](https://hub.docker.com/r/gmeligio/flutter-android) | -| GitHub Container Registry | [ghcr.io/gmeligio/flutter-android:3.35.7](https://github.com/gmeligio/flutter-docker-image/pkgs/container/flutter-android) | -| Quay | [quay.io/gmeligio/flutter-android:3.35.7](https://quay.io/repository/gmeligio/flutter-android) | +| Docker Hub | [gmeligio/flutter-android:3.38.0](https://hub.docker.com/r/gmeligio/flutter-android) | +| GitHub Container Registry | [ghcr.io/gmeligio/flutter-android:3.38.0](https://github.com/gmeligio/flutter-docker-image/pkgs/container/flutter-android) | +| Quay | [quay.io/gmeligio/flutter-android:3.38.0](https://quay.io/repository/gmeligio/flutter-android) | On the terminal: ```bash # From GitHub Container Registry -docker run --rm -it ghcr.io/gmeligio/flutter-android:3.35.7 bash +docker run --rm -it ghcr.io/gmeligio/flutter-android:3.38.0 bash ``` On a workflow in GitHub Actions: @@ -58,7 +58,7 @@ jobs: build: runs-on: ubuntu-22.04 container: - image: ghcr.io/gmeligio/flutter-android:3.35.7 + image: ghcr.io/gmeligio/flutter-android:3.38.0 steps: - name: Checkout uses: actions/checkout@v2 @@ -70,7 +70,7 @@ On a `.gitlab-ci.yml` in GitLab CI: ```yaml build: - image: ghcr.io/gmeligio/flutter-android:3.35.7 + image: ghcr.io/gmeligio/flutter-android:3.38.0 script: - flutter build apk ``` @@ -91,20 +91,20 @@ bundle exec fastlane Every new tag on the flutter stable channel gets built. The tag is composed of the Flutter version used to build the image: -* Docker image: gmeligio/flutter-android:3.35.7 -* Flutter version: 3.35.7 +* Docker image: gmeligio/flutter-android:3.38.0 +* Flutter version: 3.38.0 ## Building Locally The android.Dockerfile expects a few arguments: -* `flutter_version `: The version of Flutter to use when building. Example: 3.35.7 +* `flutter_version `: The version of Flutter to use when building. Example: 3.38.0 * `android_build_tools_version `: The version of the Android SDK Build Tools to install. Example: 35.0.0 * `android_platform_versions `: The versions of the Android SDK Platforms to install, separated by spaces. Example: 36 ```bash # Android -docker build --target android --build-arg flutter_version=3.35.7 --build-arg fastlane_version=2.228.0 --build-arg android_build_tools_version=35.0.0 --build-arg android_platform_versions="36" -t android-test . +docker build --target android --build-arg flutter_version=3.38.0 --build-arg fastlane_version=2.228.0 --build-arg android_build_tools_version=35.0.0 --build-arg android_platform_versions="36" -t android-test . ``` ## Roadmap diff --git a/test/android.yml b/test/android.yml index b8a24c7..09ba335 100644 --- a/test/android.yml +++ b/test/android.yml @@ -30,7 +30,7 @@ commandTests: args: - /home/flutter/sdks/android-sdk/ndk expectedOutput: - - 27.0.12077973 + - 28.2.13676358 - name: CMake is pinned command: ls args: