mirror of
https://github.com/x-tools-author/x-tools.git
synced 2025-09-15 15:28:40 +08:00
chore: update the file
This commit is contained in:
parent
4fc9dac262
commit
dacb9bdd5b
40
.github/workflows/build-docker.yml
vendored
40
.github/workflows/build-docker.yml
vendored
@ -16,26 +16,26 @@ 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
|
||||
docker build -t x-tools-ubuntu-20.04:x86_64 . -f docker/20.04/Dockerfile
|
||||
|
||||
4
.github/workflows/build-ubuntu.yml
vendored
4
.github/workflows/build-ubuntu.yml
vendored
@ -14,7 +14,7 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-22.04]
|
||||
version: [6.2.4, 6.5.3, 6.8.3, 6.9.0]
|
||||
version: [6.2.4, 6.5.3, 6.8.3]
|
||||
arch: [gcc_64, linux_gcc_64]
|
||||
exclude:
|
||||
- version: 6.2.4
|
||||
@ -23,8 +23,6 @@ jobs:
|
||||
arch: linux_gcc_64
|
||||
- version: 6.8.3
|
||||
arch: gcc_64
|
||||
- version: 6.9.0
|
||||
arch: gcc_64
|
||||
steps:
|
||||
- name: checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
@ -37,7 +37,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}
|
||||
|
||||
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
|
||||
ENV ANDROID_HOME=/usr/local/lib/android/sdk
|
||||
|
||||
Loading…
Reference in New Issue
Block a user