Many imorovments
This commit is contained in:
@@ -25,6 +25,9 @@ ARG NDK_VERSION=27.2.12479018
|
||||
ARG CMDLINE_TOOLS=13114758
|
||||
# Must satisfy cargo-ndk's MSRV (4.1.x needs >= 1.86) as well as our own crates.
|
||||
ARG RUST_VERSION=1.92.0
|
||||
# Gitea runs JavaScript actions (actions/checkout, actions/cache) with Node from
|
||||
# inside the job container. Bookworm ships 18; current actions expect 20+.
|
||||
ARG NODE_MAJOR=20
|
||||
|
||||
# JDK 17, not the host's 25: the Android Gradle Plugin supports 17 as its
|
||||
# stable target, and newer JDKs regularly break Gradle in ways that cost more
|
||||
@@ -51,6 +54,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
build-essential cmake python3 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Node — required by the CI runner, not by the Android build
|
||||
#
|
||||
# This image is the job container for the Android CI job, and Gitea executes
|
||||
# actions/checkout inside it using the container's own Node. Without this the
|
||||
# job fails at checkout with "Cannot find: node in PATH", before any Rust or
|
||||
# Gradle step runs. Local builds never invoke it.
|
||||
# ---------------------------------------------------------------------------
|
||||
RUN curl -fsSL "https://deb.nodesource.com/setup_${NODE_MAJOR}.x" | bash - \
|
||||
&& apt-get install -y --no-install-recommends nodejs \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& node --version
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Android SDK + NDK
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user