chore: update the file

This commit is contained in:
x-tools-author 2025-04-25 14:43:04 +08:00
parent 70731dcb20
commit 6460faa3ed
2 changed files with 23 additions and 23 deletions

View File

@ -13,30 +13,30 @@ 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
copy $ANDROID_HOME sdk
copy $JAVA_HOME_17_X64 jdk
cp $ANDROID_HOME sdk
cp $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} \

View File

@ -35,7 +35,7 @@ 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 Qt ${QT_ROOT}
# Copy jdk files from host to container
ARG HOST_JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64