software/x-tools
1
0
Fork 0
mirror of https://github.com/x-tools-author/x-tools.git synced 2025-09-15 15:28:40 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

chore: update the file

Browse Source
This commit is contained in:
x-tools-author 2025-04-25 14:36:31 +08:00
parent 992b51fda0
commit 70731dcb20
2 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/build-test.yml vendored
View File

@ -35,11 +35,16 @@ jobs:
version: ${{ env.QT_VERSION }}
- name: build docker image
run: | # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md
echo $ANDROID_HOME
sudo tree -L 2 $ANDROID_HOME
sudo chmod -R 755 $JAVA_HOME_17_X64
sudo chmod -R 755 $ANDROID_HOME
sudo docker build -t x-tools-ubuntu-20.04-1:x86_64 . -f docker/20.04-android/Dockerfile
copy $ANDROID_HOME sdk
copy $JAVA_HOME_17_X64 jdk
sudo docker build -t x-tools-ubuntu-20.04-1:x86_64 . -f docker/20.04-android/Dockerfile \
--build-arg HOST_JAVA_HOME=${JAVA_HOME_17_X64} \
--build-arg HOST_ANDROID_NDK=${ANDROID_NDK} \
--build-arg HOST_ANDROID_NDK_HOME=${ANDROID_NDK_HOME} \
--build-arg HOST_ANDROID_NDK_LATEST_HOME=${ANDROID_NDK_LATEST_HOME} \
--build-arg HOST_ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT} \
--build-arg HOST_ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}
# - name: push docker image to github registry
# run: |
# echo ${{ env.CR_PAT }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin

28
docker/20.04-android/Dockerfile
View File

@ -1,8 +1,6 @@
FROM ubuntu:20.04
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get -y update && apt-get install -y \
RUN export DEBIAN_FRONTEND=noninteractive && apt-get -y update && apt-get install -y \
libxcb-xinerama0 \
libxcb-cursor-dev \
libudev-dev \
@ -18,7 +16,7 @@ RUN apt-get -y update && apt-get install -y \
git \
libglib2.0-dev \
libxkb* \
libdbus \
libdbus* \
libegl1-mesa-dev \
libfontconfig1-dev \
libfreetype6-dev \
@ -38,3 +36,25 @@ RUN rm cmake-3.30.8-linux-x86_64.sh
# Copy Qt files from host to container
ENV QT_ROOT=/opt/qt
COPY Qt ${QT_ROOT}
# Copy jdk files from host to container
ARG HOST_JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
ENV JAVA_HOME=${HOST_JAVA_HOME}
COPY jdk ${JAVA_HOME}
# Copy Android SDK files from host to container
ARG HOST_ANDROID_HOME=/usr/local/lib/android/sdk
ARG HOST_ANDROID_NDK=/usr/local/lib/android/sdk/ndk/27.2.12479018
ARG HOST_ANDROID_NDK_HOME=/usr/local/lib/android/sdk/ndk/27.2.12479018
ARG HOST_ANDROID_NDK_LATEST_HOME=/usr/local/lib/android/sdk/ndk/27.2.12479018
ARG HOST_ANDROID_NDK_ROOT=/usr/local/lib/android/sdk/ndk/27.2.12479018
ARG HOST_ANDROID_SDK_ROOT=/usr/local/lib/android/sdk
ENV ANDROID_HOME=${HOST_ANDROID_HOME}
ENV ANDROID_NDK=${HOST_ANDROID_NDK}
ENV ANDROID_NDK_HOME=${HOST_ANDROID_NDK_HOME}
ENV ANDROID_NDK_LATEST_HOME=${HOST_ANDROID_NDK_LATEST_HOME}
ENV ANDROID_NDK_ROOT=${HOST_ANDROID_NDK_ROOT}
ENV ANDROID_SDK_ROOT=${HOST_ANDROID_SDK_ROOT}
COPY sdk ${ANDROID_HOME}