diff --git a/.github/workflows/generator-android.yml b/.github/workflows/generator-android.yml index 56475f0..95705ed 100644 --- a/.github/workflows/generator-android.yml +++ b/.github/workflows/generator-android.yml @@ -171,7 +171,7 @@ jobs: g++ \ g++-multilib \ imagemagick \ - libappindicator3-dev \ + libayatana-appindicator3-dev \ libasound2-dev \ libc6-dev \ libclang-10-dev \ @@ -214,6 +214,13 @@ jobs: channel: "stable" flutter-version: ${{ env.ANDROID_FLUTTER_VERSION }} + - name: Patch flutter + continue-on-error: true + run: | + cd $(dirname $(dirname $(which flutter))) + [[ "3.24.4" == ${{env.ANDROID_FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff + + - uses: nttld/setup-ndk@v1 id: setup-ndk with: @@ -263,6 +270,12 @@ jobs: fi shell: bash + - name: Restore bridge files + uses: actions/download-artifact@master + with: + name: bridge-artifact + path: ./ + - name: Install Rust toolchain uses: dtolnay/rust-toolchain@v1 with: diff --git a/.github/workflows/generator-linux.yml b/.github/workflows/generator-linux.yml index 9e60507..1ba142c 100644 --- a/.github/workflows/generator-linux.yml +++ b/.github/workflows/generator-linux.yml @@ -367,7 +367,7 @@ jobs: git \ g++ \ imagemagick \ - libappindicator3-dev \ + libayatana-appindicator3-dev \ libasound2-dev \ libclang-10-dev \ libgstreamer1.0-dev \ @@ -463,6 +463,19 @@ jobs: ;; esac + if [[ "3.24.4" == ${{ env.FLUTTER_VERSION }} ]]; then + case ${{ matrix.job.arch }} in + aarch64) + pushd /opt/flutter-elinux/flutter + ;; + x86_64) + pushd /opt/flutter + ;; + esac + git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff + popd + fi + # build flutter pushd /workspace mkdir output