From eb758f7765b8146fb4778c0a1739e91a01192d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Thu, 30 Mar 2023 22:18:42 +0800 Subject: [PATCH] update --- .github/workflows/macos.yml | 5 +++-- .github/workflows/ubuntu.yml | 5 +++-- .github/workflows/windows.yml | 7 +------ aqtinstall.log | 1 - 4 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 aqtinstall.log diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index abb1fc06..0caaa235 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -30,11 +30,12 @@ jobs: sudo xcode-select --print-path sudo xcode-select --switch /Library/Developer/CommandLineTools - name: Install Qt - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: version: ${{ matrix.qt_ver }} cached: 'false' - modules: 'qtmultimedia' + arch: ${{ matrix.qt_arch }} + modules: 'qt5compat qtmultimedia' - uses: actions/checkout@v2 with: fetch-depth: 1 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 4a2cbee7..76e44a36 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -25,11 +25,12 @@ jobs: targetName: example steps: - name: Install Qt - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: version: ${{ matrix.qt_ver }} cached: 'false' - modules: 'qtmultimedia' + arch: ${{ matrix.qt_arch }} + modules: 'qt5compat qtmultimedia' - name: ubuntu install GL library run: sudo apt-get install -y libglew-dev libglfw3-dev qml-module-qtquick-controls qml-module-qtquick-controls2 - uses: actions/checkout@v2 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8e8d52c4..291a7b11 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -35,15 +35,10 @@ jobs: # 使用外部action。这个action专门用来安装Qt uses: jurplel/install-qt-action@v3 with: - # Version of Qt to install version: ${{ matrix.qt_ver }} - # Target platform for build - # target: ${{ matrix.qt_target }} arch: ${{ matrix.qt_arch }} cached: 'false' - install-deps: 'true' - modules: 'qtmultimedia' - archives: 'qtbase qtsvg' + modules: 'qt5compat qtmultimedia' # 拉取代码 - uses: actions/checkout@v2 with: diff --git a/aqtinstall.log b/aqtinstall.log deleted file mode 100644 index b6945ce7..00000000 --- a/aqtinstall.log +++ /dev/null @@ -1 +0,0 @@ -2023-03-30 22:02:12,816 - aqt.helper - DEBUG - helper 13344 Attempt to download checksum at https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5152/Updates.xml.sha256