Merge branch 'master' into feature/zip-support

.github/workflows/build-ubuntu-aarch64.yml

@@ -20,8 +20,10 @@ jobs:
     - name: Upgrade system
       shell: bash
       working-directory: ${{runner.workspace}}
-      run: |
+      run: | #Fix grub installation error - https://github.com/actions/virtual-environments/issues/1605
         sudo apt update
+        sudo apt-get install grub-efi  
+        sudo update-grub
         sudo apt full-upgrade
     - name: Install dependencies
       shell: bash
@@ -32,7 +34,8 @@ jobs:
         sudo rm /etc/apt/sources.list
         sudo mv /etc/apt/sources.list{.new,}
         sudo apt update
-        sudo apt install {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64 libslirp-dev:arm64 libzip-dev:arm64
+        sudo apt install aptitude
+        sudo aptitude install -y {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64 libslirp-dev:arm64 libarchive-dev:arm64
     - name: Create build environment
       run: mkdir ${{runner.workspace}}/build
     - name: Configure

.github/workflows/build-ubuntu.yml

@@ -24,8 +24,8 @@ jobs:
       working-directory: ${{runner.workspace}}
       run: | # Fetch a new version of CMake, because the default is too old.
         sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list \
-        && sudo apt-get update \
-        && sudo apt-get install cmake libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp-dev libzip-dev
+        && sudo apt update \
+        && sudo apt install cmake libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp0=4.1.0-2ubuntu2.1 libslirp-dev libarchive-dev --allow-downgrades
     - name: Create build environment
       run: mkdir ${{runner.workspace}}/build
     - name: Configure

.github/workflows/build-windows.yml

@@ -36,9 +36,8 @@ jobs:
     - name: Make
       run: |
         C:\tools\msys64\usr\bin\bash.exe -lc "export PATH=`"/mingw64/bin:`$PATH`" \
-        && cd melonDS/build && make -j$(nproc --all) \
-        && ../msys-dist.sh"
+        && cd melonDS/build && make -j$(nproc --all)"
     - uses: actions/upload-artifact@v1
       with:
         name: melonDS
-        path: C:\tools\msys64\home\runneradmin\melonDS\build\dist
+        path: C:\tools\msys64\home\runneradmin\melonDS\build\melonDS.exe