Skip to content

Commit 9699879

Browse files
Introduce CI container and optimize workflows
- Added `.ci/container/Dockerfile` based on Ubuntu 24.04 with Java 8-25, Android SDK, and build tools. - Added `.github/workflows/build-container.yml` to build and push the container image. - Updated `.github/workflows/pr.yml`, `ant.yml`, `scripts-android.yml`, `parparvm-tests.yml` to use the new container. - Updated `scripts/setup-workspace.sh` to respect `CN1_BINARIES` and skip updates if needed. - Optimized dependencies installation by using pre-installed tools in the container.
1 parent 8240b58 commit 9699879

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

.ci/container/Dockerfile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,15 @@ ENV JDK8_HOME=/usr/lib/jvm/zulu8-fx
8888
# If these paths are wrong, the build might fail later when finding java.
8989
# We will verify them in a RUN step or create symlinks.
9090

91-
RUN ln -s /usr/lib/jvm/zulu*11* /usr/lib/jvm/java-11-zulu && \
92-
ln -s /usr/lib/jvm/zulu*17* /usr/lib/jvm/java-17-zulu && \
93-
ln -s /usr/lib/jvm/zulu*21* /usr/lib/jvm/java-21-zulu && \
94-
ln -s /usr/lib/jvm/zulu*25* /usr/lib/jvm/java-25-zulu
91+
RUN for v in 11 17 21 25; do \
92+
dir=$(ls -d /usr/lib/jvm/zulu*${v}* 2>/dev/null | head -n 1); \
93+
if [ -n "$dir" ]; then \
94+
echo "Linking $dir to /usr/lib/jvm/java-${v}-zulu"; \
95+
ln -s "$dir" "/usr/lib/jvm/java-${v}-zulu"; \
96+
else \
97+
echo "Java ${v} not found"; \
98+
fi \
99+
done
95100

96101
ENV JAVA11_HOME=/usr/lib/jvm/java-11-zulu
97102
ENV JDK11_HOME=/usr/lib/jvm/java-11-zulu

0 commit comments

Comments
 (0)