From 14ceb3a4c68358ec10c39ecadb24f094bcb817ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Sat, 25 Mar 2023 11:49:12 +0800 Subject: [PATCH] update --- .github/workflows/macos.yml | 10 ++++------ .github/workflows/ubuntu.yml | 10 ++++------ .github/workflows/windows.yml | 8 ++++---- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index dcc74183..56e8cca1 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -30,13 +30,11 @@ jobs: sudo xcode-select --print-path sudo xcode-select --switch /Library/Developer/CommandLineTools - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v2 with: version: ${{ matrix.qt_ver }} - modules: 'qtmultimedia qt5compat qtshadertools' - aqtversion: '==2.1.*' - arch: ${{ matrix.qt_arch }} cached: 'false' + modules: 'qtmultimedia qt5compat qtshadertools' - uses: actions/checkout@v2 with: fetch-depth: 1 @@ -48,11 +46,11 @@ jobs: - name: package run: | # 拷贝依赖 - macdeployqt bin/release/${targetName}.app -qmldir=. -verbose=1 -dmg + macdeployqt bin/release/${targetName}.app -qmldir=. -plugin=qt -verbose=1 -dmg # 上传artifacts - uses: actions/upload-artifact@v2 with: - name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}.zip + name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}} path: bin/release/${{ env.targetName }}.app # tag 上传Release - name: uploadRelease diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index d9615685..8c6a6a2c 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -30,15 +30,13 @@ jobs: targetName: example steps: - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v2 with: version: ${{ matrix.qt_ver }} cached: 'false' - aqtversion: '==2.1.*' - arch: ${{ matrix.qt_arch }} modules: 'qtmultimedia qt5compat qtshadertools' - name: ubuntu install GL library - run: sudo apt-get install -y libglew-dev libglfw3-dev qml-module-qtquick-controls qml-module-qtquick-controls2 + run: sudo apt-get install -y libglew-dev libglfw3-dev qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtmultimedia - uses: actions/checkout@v2 with: fetch-depth: 1 @@ -54,9 +52,9 @@ jobs: - name: package run: | # make sure Qt plugin finds QML sources so it can deploy the imported files - export QML_SOURCES_PATHS=./ + export QML_SOURCES_PATHS=src # 拷贝依赖 - linuxdeploy-x86_64.AppImage --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=bin/release/${targetName} --appdir bin/release/ + linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=bin/release/${targetName} --appdir bin/release/ mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}.AppImage # 上传artifacts - uses: actions/upload-artifact@v2 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b09268e8..616c611c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -34,14 +34,14 @@ jobs: # 安装Qt - name: Install Qt # 使用外部action。这个action专门用来安装Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v2 with: # Version of Qt to install version: ${{ matrix.qt_ver }} - modules: 'qtmultimedia qt5compat qtshadertools' - aqtversion: '==2.1.*' arch: ${{ matrix.qt_arch }} - cached: 'false' + cached: 'false' + aqtversion: '==2.0.5' + modules: 'qtmultimedia qt5compat qtshadertools' # 拉取代码 - uses: actions/checkout@v2 with: