chore: update the file

This commit is contained in:
x-tools-author 2025-04-25 13:13:58 +08:00
parent de1d2afcc2
commit ba29975e39
2 changed files with 23 additions and 22 deletions

View File

@ -13,32 +13,33 @@ jobs:
steps:
- name: Pull respository
uses: actions/checkout@v4
- name: Install Qt(android)
uses: jurplel/install-qt-action@v4
with:
aqtversion: '==3.1.*'
target: android
arch: android_armv7
host: linux
dir: ${{ github.workspace }}
modules: ${{env.QT_MODULES}}
version: ${{ env.QT_VERSION }}
- name: Install Qt(linux_gcc_64)
uses: jurplel/install-qt-action@v4
with:
aqtversion: '==3.1.*'
target: desktop
arch: linux_gcc_64
host: linux
dir: ${{ github.workspace }}
modules: ${{env.QT_MODULES}}
version: ${{ env.QT_VERSION }}
# - name: Install Qt(android)
# uses: jurplel/install-qt-action@v4
# with:
# aqtversion: '==3.1.*'
# target: android
# arch: android_armv7
# host: linux
# dir: ${{ github.workspace }}
# modules: ${{env.QT_MODULES}}
# version: ${{ env.QT_VERSION }}
# - name: Install Qt(linux_gcc_64)
# uses: jurplel/install-qt-action@v4
# with:
# aqtversion: '==3.1.*'
# target: desktop
# arch: linux_gcc_64
# host: linux
# dir: ${{ github.workspace }}
# modules: ${{env.QT_MODULES}}
# 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
docker build -t x-tools-ubuntu-20.04-1:x86_64 . -f docker/20.04-android/Dockerfile \
--build-arg HOST_QT_ROOT=${{ github.workspace }}/Qt \
--build-arg HOST_JAVA_HOME=$JAVA_HOME_17_X64 \
--build-arg HOST_ANDROID_HOME=${ANDROID_HOME} \
--build-arg HOST_ANDROID_HOME=$ANDROID_HOME \
--build-arg HOST_NDK_VERSION=21.4.7075529
- name: push docker image to github registry
run: |

View File

@ -16,7 +16,7 @@ RUN rm cmake-3.30.8-linux-x86_64.sh
# Copy Qt files from host to container
ARG HOST_QT_ROOT=Qt
ENV QT_ROOT=/opt/qt
COPY ${HOST_QT_ROOT} ${QT_ROOT}
# COPY ${HOST_QT_ROOT} ${QT_ROOT}
# Copy Android JDK from host to container
ARG HOST_JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64