From faa6c625cb81014d4a099fa9886994c6bc44ce62 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 12:14:45 +0800 Subject: [PATCH] update --- .github/workflows/macos.yml | 1 + .github/workflows/ubuntu.yml | 10 +++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8f7690c6..0b817b4a 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -34,6 +34,7 @@ jobs: with: version: ${{ matrix.qt_ver }} cached: 'false' + aqtversion: '==2.0.5' modules: 'qtmultimedia qt5compat qtshadertools' - uses: actions/checkout@v2 with: diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 752c3c87..766465ec 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -18,14 +18,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04,ubuntu-20.04] + os: [ubuntu-20.04] qt_ver: [6.4.3] qt_arch: [gcc_64] - exclude: - # Qt6.2.2 need GLIBC_2.28, ubuntu 18.04 have not. - - os: ubuntu-18.04 - qt_ver: 6.4.3 - qt_arch: gcc_64 env: targetName: example steps: @@ -34,9 +29,10 @@ jobs: with: version: ${{ matrix.qt_ver }} cached: 'false' + aqtversion: '==2.0.5' 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 qml-module-qtmultimedia + run: sudo apt-get install -y libglew-dev libglfw3-dev qml-module-qtquick-controls qml-module-qtquick-controls2 - uses: actions/checkout@v2 with: fetch-depth: 1