From 408d24a35b31ee55c9bb5115bcbe0d863f94051f Mon Sep 17 00:00:00 2001
From: xiaoming <2014500726@smail.xtu.edu.cn>
Date: Mon, 13 Nov 2023 03:23:22 +0800
Subject: [PATCH] Update Qt modules and add Conda setup.

Signed-off-by: xiaoming <2014500726@smail.xtu.edu.cn>
---
 .github/workflows/android.yml | 4 ++--
 .github/workflows/main_ci.yml | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 3cd6b62b04..38f59aadc8 100644
--- 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
index 58185fad10..4e6d6a28e9 100644
--- 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