diff --git a/.gitea/ci/Dockerfile b/.gitea/ci/Dockerfile index a341e77f..75ad69e8 100644 --- a/.gitea/ci/Dockerfile +++ b/.gitea/ci/Dockerfile @@ -1,35 +1,29 @@ # CI image for the `build` job (.gitea/workflows/build.yml): the Flutter image -# plus everything the release build used to download on EVERY run - the -# Android SDK packages Gradle auto-installs (two NDKs, build-tools, platform, -# CMake: ~4 min) and Flutter's Android engine artifacts - and node for JS -# actions (actions/cache restores the Gradle and pub caches). +# plus node (actions/cache is a JS action; the image has node 18 only) and +# fixed paths for the Gradle and pub caches. +# +# Deliberately thin. The big downloads - the Android SDK packages Gradle +# auto-installs (two NDKs, CMake, ~4 min) and Gradle's dependencies - are +# restored by actions/cache, whose store is on the runner's disk. Baking the +# NDKs in made a 14 G image in the runner's 48 G RAM-backed image store +# (grg-runner); its cleanup evicts such images under pressure, so it would be +# rebuilt most runs, and on 2026-10-26 it filled the store (Gradle: "No space +# left on device"). # # Built by the `ci-image` job, tagged by a hash of this file, into the local # Docker of the `big` runner; a Renovate bump of either base digest rebuilds -# it. When upstream moves to a different NDK the build still works (Gradle -# installs it), just slower - the "SDK packages" step of the build job warns -# about it, then update the list below. +# it (seconds - only node is added on top of the Flutter image). FROM node:24-trixie-slim@sha256:43b9ba1142b8dcf33fa8f922ca1be85714adc444e0586c7cf7726daaeabc1bea AS node FROM ghcr.io/cirruslabs/flutter:stable@sha256:46691e311715845de03a3ba4753a475476936805b29431b1f00f1816981033f8 COPY --from=node /usr/local/bin/node /usr/local/bin/node -# Gradle and pub caches at fixed paths: the build job restores/saves exactly -# these with actions/cache (HOME inside a job container is not reliably -# /root, and Gradle takes its home from passwd, not $HOME). Gradle's build -# cache lives in there too, so unchanged plugin modules are not recompiled. +# Fixed cache paths: the build job restores/saves exactly these (HOME inside +# a job container is not reliably /root, and Gradle takes its home from +# passwd, not $HOME). Gradle's build cache lives in there too. ENV GRADLE_USER_HOME=/ci-cache/gradle \ PUB_CACHE=/ci-cache/pub RUN mkdir -p "$GRADLE_USER_HOME" "$PUB_CACHE" \ - && echo 'org.gradle.caching=true' >"$GRADLE_USER_HOME/gradle.properties" - -RUN yes | sdkmanager --licenses >/dev/null \ - && sdkmanager --install \ - "ndk;29.0.14206865" \ - "ndk;28.2.13676358" \ - "build-tools;35.0.0" \ - "platforms;android-35" \ - "cmake;3.22.1" \ - && flutter precache --android \ - && node --version && flutter --version + && echo 'org.gradle.caching=true' >"$GRADLE_USER_HOME/gradle.properties" \ + && node --version diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 842ab7e4..d7aac451 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -41,9 +41,8 @@ defaults: shell: bash jobs: - # CI image (.gitea/ci/Dockerfile: Flutter + the Android SDK packages and - # engine artifacts every build used to download, ~4 min) tagged by a hash - # of its Dockerfile. Built straight into the Docker of the `big` runner + # CI image (.gitea/ci/Dockerfile: Flutter + node for actions/cache, cache + # paths) tagged by a hash of its Dockerfile. Built straight into the Docker of the `big` runner # (grg-runner, the only one with that label) and never pushed: the job # container below then starts from the local image. If the image is gone # (prune), this job just builds it again. @@ -128,6 +127,23 @@ jobs: echo "needed=true" >>"$GITHUB_OUTPUT" fi + # Android SDK packages Gradle installs on demand (two NDKs, CMake, + # build-tools, platform: ~4 min of downloads per build). Own cache entry: + # ~5 G that changes only with the NDK pin, not with every pubspec.lock. + # A new package (upstream moved on) is installed by Gradle and saved + # under the new key; the build step warns about it. + - name: Android SDK packages cache + if: steps.rel.outputs.needed == 'true' + uses: actions/cache@v6 + with: + path: | + /opt/android-sdk-linux/ndk + /opt/android-sdk-linux/cmake + /opt/android-sdk-linux/build-tools + /opt/android-sdk-linux/platforms + key: android-sdk-${{ hashFiles('android/app/build.gradle.kts', 'android/build.gradle.kts', 'android/settings.gradle.kts') }} + restore-keys: android-sdk- + # Gradle (deps, wrapper, build cache) and pub caches; the paths are set # in .gitea/ci/Dockerfile. Without it Gradle spent ~17 min per build. - name: Gradle and pub cache @@ -138,8 +154,8 @@ jobs: /ci-cache/gradle/caches /ci-cache/gradle/wrapper /ci-cache/pub - key: android-${{ hashFiles('pubspec.lock', 'android/**/*.gradle.kts', 'android/gradle/wrapper/gradle-wrapper.properties') }} - restore-keys: android- + key: gradle-pub-${{ hashFiles('pubspec.lock', 'android/**/*.gradle.kts', 'android/gradle/wrapper/gradle-wrapper.properties') }} + restore-keys: gradle-pub- - name: Tests if: steps.rel.outputs.needed == 'true' @@ -187,10 +203,11 @@ jobs: code=$((($(date -u +%s) - 1767225600) / 60)) flutter build apk --release --no-pub --target-platform android-arm64 \ --build-name "$name" --build-number "$code" 2>&1 | tee "$RUNNER_TEMP/build.log" - # The CI image should already hold every SDK package; an install here - # means upstream moved on (new NDK, ...) - update .gitea/ci/Dockerfile. + # With a warm SDK cache Gradle installs nothing; an install means the + # cache was cold or upstream moved on (new NDK, ...) - the next run + # restores it from the cache saved by this one. if grep '^Installing ' "$RUNNER_TEMP/build.log"; then - echo "::warning::Gradle installed SDK packages missing from .gitea/ci/Dockerfile (see above)" + echo "::warning::Gradle installed Android SDK packages (cold cache or a new pin, see above)" fi rm -f android/key.properties "$ks" apk="$RUNNER_TEMP/meshcore-open-$name-arm64.apk"