The web build resolves com.yarnpkg:yarn from GitHub during configuration. A run failed after two minutes with a GitHub read timeout, even though nothing in the commit touched the Wasm target. Run kotlinNodeJsSetup and kotlinYarnSetup during the image warm-up so node and yarn come from the Gradle cache in GRADLE_USER_HOME instead of a fresh GitHub download. Bump the image to audiomanager-client-ci:3.
This commit is contained in:
1 parent
b8bbf8d07c
commit
8f94bb18e7
3 files changed
+8
-5
No files matched your search
@@ -11,7 +11,7 @@ on:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
# Built by scripts/build-ci-image.sh from ci/Dockerfile.
|
# 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:
|
jobs:
|
||||||
build:
|
build:
|
||||||
@@ -19,7 +19,7 @@ jobs:
|
|||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
container:
|
container:
|
||||||
image: gitea.tap-tap.win/taptap/audiomanager-client-ci:2
|
image: gitea.tap-tap.win/taptap/audiomanager-client-ci:3
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
|||||||
+5
-2
@@ -48,10 +48,13 @@ RUN mkdir -p "$ANDROID_HOME/cmdline-tools" \
|
|||||||
# when dependencies change.
|
# when dependencies change.
|
||||||
COPY . /warmup
|
COPY . /warmup
|
||||||
WORKDIR /warmup
|
WORKDIR /warmup
|
||||||
# Only warm dependencies and the common/Android/desktop compilers here. The
|
# Warm dependencies and the common/Android/desktop compilers here. The Wasm
|
||||||
# Wasm executable build is memory hungry; the web job downloads node/yarn itself.
|
# 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 \
|
RUN sed -i 's/kotlin.daemon.jvmargs=-Xmx3g/kotlin.daemon.jvmargs=-Xmx2g/' gradle.properties \
|
||||||
&& gradle --no-daemon --max-workers=2 \
|
&& gradle --no-daemon --max-workers=2 \
|
||||||
|
:kotlinNodeJsSetup \
|
||||||
|
:kotlinYarnSetup \
|
||||||
:composeApp:desktopTest \
|
:composeApp:desktopTest \
|
||||||
:composeApp:assembleDebug \
|
:composeApp:assembleDebug \
|
||||||
:composeApp:compileKotlinWasmJs \
|
:composeApp:compileKotlinWasmJs \
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ set -euo pipefail
|
|||||||
|
|
||||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
IMAGE="${CI_IMAGE:-gitea.tap-tap.win/taptap/audiomanager-client-ci}"
|
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 build -f "$ROOT/ci/Dockerfile" -t "$IMAGE:$TAG" "$ROOT"
|
||||||
docker push "$IMAGE:$TAG"
|
docker push "$IMAGE:$TAG"
|
||||||
Reference in new issue
Block a user