Update Qt modules and add Conda setup.

Signed-off-by: xiaoming <[email protected]>
QQxiaoming · Nov 12, 2023 · 408d24a · 408d24a
1 parent 1997bcf
commit 408d24a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -31,14 +31,14 @@ jobs:
         uses: jurplel/install-qt-action@v3
         with:
           version: '6.5.3'
-          modules: 'qt5compat qtwebsockets qtmultimedia'
+          modules: 'qt5compat qtwebsockets'
           aqtversion: ==3.1.7
 
       - name: Install Qt android
         uses: jurplel/install-qt-action@v3
         with:
           version: '6.5.3'
-          modules: 'qt5compat qtwebsockets'
+          modules: 'qt5compat qtwebsockets qtmultimedia'
           aqtversion: ==3.1.7
           target: 'android'
           arch: 'android_arm64_v8a'

diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml
@@ -193,6 +193,11 @@ jobs:
         run: |
           brew install libslirp libffi gettext glib pkg-config autoconf automake pixman ninja dylibbundler
 
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          auto-activate-base: true
+          activate-environment: ""
+
       - name: Build all
         run: |
           ./build.sh qemu_macos