diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 68a407f..e5caa9d 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -11,7 +11,7 @@ on: env: # Built by scripts/build-ci-image.sh from ci/Dockerfile. - CI_IMAGE: gitea.tap-tap.win/taptap/audiomanager-client-ci:2 + CI_IMAGE: gitea.tap-tap.win/taptap/audiomanager-client-ci:3 jobs: build: @@ -19,7 +19,7 @@ jobs: permissions: contents: write container: - image: gitea.tap-tap.win/taptap/audiomanager-client-ci:2 + image: gitea.tap-tap.win/taptap/audiomanager-client-ci:3 steps: - uses: actions/checkout@v4 diff --git a/ci/Dockerfile b/ci/Dockerfile index 0beec1a..02d49d4 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -48,10 +48,13 @@ RUN mkdir -p "$ANDROID_HOME/cmdline-tools" \ # when dependencies change. COPY . /warmup WORKDIR /warmup -# Only warm dependencies and the common/Android/desktop compilers here. The -# Wasm executable build is memory hungry; the web job downloads node/yarn itself. +# Warm dependencies and the common/Android/desktop compilers here. The Wasm +# executable build is memory hungry and stays in the web job, but node and yarn +# are cached: Kotlin downloads them from GitHub, which has been flaky during CI. RUN sed -i 's/kotlin.daemon.jvmargs=-Xmx3g/kotlin.daemon.jvmargs=-Xmx2g/' gradle.properties \ && gradle --no-daemon --max-workers=2 \ + :kotlinNodeJsSetup \ + :kotlinYarnSetup \ :composeApp:desktopTest \ :composeApp:assembleDebug \ :composeApp:compileKotlinWasmJs \ diff --git a/scripts/build-ci-image.sh b/scripts/build-ci-image.sh index 5df6923..6e87e7d 100755 --- a/scripts/build-ci-image.sh +++ b/scripts/build-ci-image.sh @@ -6,7 +6,7 @@ set -euo pipefail ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" IMAGE="${CI_IMAGE:-gitea.tap-tap.win/taptap/audiomanager-client-ci}" -TAG="${1:-1}" +TAG="${1:-3}" docker build -f "$ROOT/ci/Dockerfile" -t "$IMAGE:$TAG" "$ROOT" docker push "$IMAGE:$TAG"