fix: use rust:slim-trixie for JDK 21 and latest Rust, trim CI paths
- Switch to Debian Trixie base for native JDK 21 and latest Rust - Remove Adoptium APT repo workaround - Only trigger Android CI on src-tauri/ and build config changes
This commit is contained in:
@@ -5,10 +5,6 @@ on:
|
|||||||
branches: [ master ]
|
branches: [ master ]
|
||||||
paths:
|
paths:
|
||||||
- 'src-tauri/**'
|
- 'src-tauri/**'
|
||||||
- 'src/**'
|
|
||||||
- 'static/**'
|
|
||||||
- 'package.json'
|
|
||||||
- 'pnpm-lock.yaml'
|
|
||||||
- 'Dockerfile.android'
|
- 'Dockerfile.android'
|
||||||
- '.gitea/workflows/android.yml'
|
- '.gitea/workflows/android.yml'
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|||||||
@@ -1,13 +1,10 @@
|
|||||||
FROM rust:1.87-bookworm
|
FROM rust:slim-trixie
|
||||||
|
|
||||||
# Java 21 via Adoptium APT repo (Bookworm only has JDK 17)
|
# Java 21 + build tools
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
unzip wget curl ca-certificates gnupg && \
|
openjdk-21-jdk-headless unzip wget curl ca-certificates && \
|
||||||
wget -qO- https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor -o /usr/share/keyrings/adoptium.gpg && \
|
|
||||||
echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb bookworm main" > /etc/apt/sources.list.d/adoptium.list && \
|
|
||||||
apt-get update && apt-get install -y --no-install-recommends temurin-21-jdk && \
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
ENV JAVA_HOME=/usr/lib/jvm/temurin-21-jdk-amd64
|
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
|
||||||
|
|
||||||
# Android SDK
|
# Android SDK
|
||||||
ENV ANDROID_HOME=/opt/android-sdk
|
ENV ANDROID_HOME=/opt/android-sdk
|
||||||
|
|||||||
Reference in New Issue
Block a user