Use aqtinstall install directly rather than jurpel/install-qt-action

EdgeTX · Sep 12, 2021 · 54e6dae · 54e6dae
1 parent c320955
commit 54e6dae
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/.github/workflows/win_cpn.yml b/.github/workflows/win_cpn.yml
@@ -41,12 +41,6 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v2
-        with:
-          version: '5.12.9'
-          arch: 'win64_mingw73'
-
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
@@ -57,9 +51,9 @@ jobs:
         run: |
           pacman -S --noconfirm mingw-w64-x86_64-cmake \
                                 mingw-w64-x86_64-python-pip \
+                                mingw-w64-x86_64-python3-setuptools \
                                 mingw-w64-x86_64-arm-none-eabi-gcc \
                                 mingw-w64-x86_64-libjpeg-turbo \
-                                mingw-w64-x86_64-zlib \
                                 mingw-w64-x86_64-libtiff \
                                 mingw-w64-x86_64-freetype \
                                 mingw-w64-x86_64-lcms2 \
@@ -69,7 +63,8 @@ jobs:
                                 mingw-w64-x86_64-libraqm \
                                 mingw-w64-x86_64-SDL \
                                 mingw-w64-x86_64-nsis
-          pip install Pillow
+          pip install aqtinstall Pillow
+          aqt install 5.12.9 windows desktop win64_mingw73
           
       - name: Build
         working-directory: ${{github.workspace}}