From d70d3315523a8f578a36edbca050ff00b31015fc Mon Sep 17 00:00:00 2001
From: Jj0YzL5nvJ <reizemberk@gmail.com>
Date: Sun, 12 Jan 2025 15:12:03 -0600
Subject: [PATCH] CI: Add missing dependencies and other minor changes

---
 .github/workflows/build.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 18cc0f743..c4a040661 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,10 +13,10 @@ jobs:
       - name: Install Packages
         run: |
           # fix for "error processing package grub-efi-amd64-signed"
-          sudo apt-get purge shim-signed grub\* --yes --allow-remove-essential
+          sudo apt-mark hold grub-common
           sudo apt-get -qq update
           sudo apt-get -y upgrade
-          sudo apt-get -y install build-essential libgl1-mesa-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools
+          sudo apt-get -y install build-essential libfreetype6-dev libgl1-mesa-dev libpng-dev qt5-qmake qtbase5-dev qtbase5-dev-tools qtchooser zlib1g-dev
       - name: Prepare Environment
         run: |
           echo "GIT_REVISION=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
@@ -76,13 +76,14 @@ jobs:
         with:
           update: true
           install: >-
+            git
             make
             mingw-w64-x86_64-cmake
             mingw-w64-x86_64-gcc
             mingw-w64-x86_64-freetype
             mingw-w64-x86_64-libpng
             mingw-w64-x86_64-qt5
-            git
+            mingw-w64-x86_64-zlib
       - name: Prepare Environment
         run: |
           $env:revision = git rev-parse --short HEAD
@@ -225,7 +226,7 @@ jobs:
   Release:
     runs-on: ubuntu-latest
     needs: [Windows, Linux]
-    if: github.ref == 'refs/heads/master'
+    if: github.ref_name == 'master'
     steps:
       - uses: actions/checkout@v4
       - name: Download Artifacts