Fix GitHub Actions builds

kefir500 · May 18, 2024 · 063bb95 · 063bb95
1 parent 148671b
commit 063bb95
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,18 +12,19 @@ jobs:
         with:
           version: 5.15.2
           arch: win32_msvc2019
-          tools: tools_openssl_x86
           cache: true
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Download Tools
         run: python scripts\download.py
+      - name: Download OpenSSL
+        run: choco install -y openssl.light --version=1.1.1.20181020 --x86 --params "/InstallDir:C:\OpenSSL"
       - name: Build MSI Package
         id: build
         shell: cmd
         run: |
           set QTDIR=%Qt5_DIR%
-          set OPENSSL=%Qt5_DIR%/../../Tools/OpenSSL/Win_x86
+          set OPENSSL=C:\OpenSSL
           set PATH=%PATH%;C:\Program Files (x86)\WiX Toolset v3.11\bin
           call scripts\windows\packages\msi\build.msi.bat || exit
           set /p VERSION=<VERSION
@@ -48,18 +49,19 @@ jobs:
         with:
           version: 5.15.2
           arch: win32_msvc2019
-          tools: tools_openssl_x86
           cache: true
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Download Tools
         run: python scripts\download.py
+      - name: Download OpenSSL
+        run: choco install -y openssl.light --version=1.1.1.20181020 --x86 --params "/InstallDir:C:\OpenSSL"
       - name: Build ZIP Package
         id: build
         shell: cmd
         run: |
           set QTDIR=%Qt5_DIR%
-          set OPENSSL=%Qt5_DIR%/../../Tools/OpenSSL/Win_x86
+          set OPENSSL=C:\OpenSSL
           call "scripts\windows\packages\zip\build.zip.bat" || exit
           set /p VERSION=<VERSION
           echo VERSION=%VERSION%>>%GITHUB_ENV%
@@ -76,15 +78,15 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
   build-linux-appimage:
     name: Linux Build (AppImage)
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Install Dependencies
         run: |
-          sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-bionic -y
+          sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-focal -y
           sudo apt-get update -qq
           sudo apt-get install qt515base qt515imageformats qt515svg qt515tools libgl1-mesa-dev libsecret-1-dev adb zipalign
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Download Tools
         run: python3 scripts/download.py
       - name: Build AppImage Package
@@ -106,15 +108,15 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
   build-macos:
     name: macOS Build (APP, DMG)
-    runs-on: macos-latest
+    runs-on: macos-12
     steps:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
           version: 5.15.2
           cache: true
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Download Tools
         run: python3 scripts/download.py
       - name: Build APP/DMG Package