chore: Bump SDL version for Windows and AppImage to 2.30.1

AntiMicroX · Mar 9, 2024 · 735882b · 735882b
1 parent 7006005
commit 735882b
Show file tree

Hide file tree

Showing 2 changed files with 316 additions and 317 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,138 +1,138 @@
 name: Build
 
 concurrency:
-    group: build-${{ github.head_ref }}
-    cancel-in-progress: true
+  group: build-${{ github.head_ref }}
+  cancel-in-progress: true
 
 on:
-    push:
-        branches:
-            - master
-    pull_request:
-        branches:
-            - master
-    workflow_dispatch:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch:
 
 jobs:
-    # Build job for Ubuntu
-    build-ubuntu:
-        strategy:
-            fail-fast: false
-            matrix:
-                include:
-                    - name: Ubuntu 22-04 GCC
-                      image: ubuntu-22.04
-                      cc: gcc
-                      cxx: g++
-                      build-type: Debug
-                      experimental: false
-                    - name: Ubuntu 22-04 Clang
-                      image: ubuntu-22.04
-                      cc: clang
-                      cxx: clang++
-                      build-type: Debug
-                      experimental: true
-                    - name: Ubuntu 20-04 GCC  (for AppImage comp)
-                      image: ubuntu-20.04
-                      cc: gcc
-                      cxx: g++
-                      build-type: Debug
-                      experimental: false
-
-        name: ${{ matrix.name }} ${{ matrix.build-type }}
-        runs-on: ${{ matrix.image }}
-        continue-on-error: ${{ matrix.experimental }}
-
-        steps:
-            - uses: actions/checkout@v3
-
-            - name: Install Dependencies
-              run: sudo apt-get update && sudo apt-get install extra-cmake-modules qttools5-dev qttools5-dev-tools libsdl2-dev libxi-dev libxtst-dev libx11-dev itstool gettext ninja-build
-
-            - name: Configure CMake
-              run: cmake -GNinja -DCHECK_FOR_UPDATES=ON -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -B ${{ github.workspace }}/build
-              env:
-                  CXX: ${{ matrix.cxx }}
-                  CC: ${{ matrix.cc }}
-
-            - name: Build AntiMicroX
-              run: cmake --build ${{ github.workspace }}/build
-
-    # Build job for Windows
-    build-windows:
-        strategy:
-            fail-fast: false
-            matrix:
-                include:
-                    - name: Windows Server 2019 MinGW
-                      image: windows-2019
-                      shell: msys2 {0}
-                      build-type: Debug
-                      qt-arch: "win64_mingw81"
-                      experimental: false
-                    - name: Windows Server 2019 MSVC
-                      image: windows-2019
-                      shell: cmd
-                      cmake-args: -G "Visual Studio 16 2019" "-DSDL2_PATH=%WORKSPACE_DIR%/sdl2/" "-DSDL2_LIBRARY=%WORKSPACE_DIR%/sdl2/lib/x64/SDL2.lib" "-DSDL2_INCLUDE_DIR=%WORKSPACE_DIR%/sdl2/" "-DSDL2_DLL_LOCATION_DIR=%WORKSPACE_DIR%/sdl2/lib/x64/SDL2.dll"
-                      build-type: Debug
-                      qt-arch: "win64_msvc2019_64"
-                      experimental: false
-        name: ${{ matrix.name }} ${{ matrix.build-type }}
-        runs-on: ${{ matrix.image }}
-        continue-on-error: ${{ matrix.experimental }}
-        defaults:
-            run:
-                shell:  ${{ matrix.shell }}
-
-        steps:
-            - uses: actions/checkout@v3
-
-            - name: Install Dependencies (msys2)
-              if: startsWith(matrix.shell, 'msys2')
-              uses: msys2/setup-msys2@v2
-              with:
-                  install: >-
-                      mingw-w64-x86_64-toolchain
-                      mingw-w64-x86_64-ninja
-                  msystem: mingw64
-                  release: false
-            #mingw-w64-x86_64-SDL2 not installed above because of: https://github.com/AntiMicroX/antimicrox/issues/465
-            - name: Install sdl2 (mingw-w64)
-              if: startsWith(matrix.shell, 'msys2')
-              run: |
-                curl -L -o mingw-w64-x86_64-SDL2-2.30.0-1-any.pkg.tar.zst https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-SDL2-2.30.0-1-any.pkg.tar.zst
-                pacman --noconfirm -U mingw-w64-x86_64-SDL2-2.30.0-1-any.pkg.tar.zst
-            
-            - name: Install sdl2 (msvc)
-              if: startsWith(matrix.shell, 'cmd')
-              run: |
-                curl -L -o SDL2-devel-2.30.0-VC.zip https://github.com/libsdl-org/SDL/releases/download/release-2.30.0/SDL2-devel-2.30.0-VC.zip
-                unzip SDL2-devel-2.30.0-VC.zip
-                mv "${{ github.workspace }}/SDL2-2.30.0" "${{ github.workspace }}/sdl2"
-                mklink /J "${{ github.workspace }}\sdl2\SDL2" "${{ github.workspace }}\sdl2\include"
-              
-            - name: Install MSVC
-              if: startsWith(matrix.shell, 'cmd')
-              uses: TheMrMilchmann/setup-msvc-dev@v2
-              with:
-                arch: x64
-                toolset: 14.1
-
-            - name: Install Qt
-              uses: jurplel/install-qt-action@v3
-              with:
-                  version: "5.15.2"
-                  host: "windows"
-                  target: "desktop"
-                  arch: ${{ matrix.qt-arch }}
-                  dir: "${{ github.workspace }}/qt/"
-                  install-deps: "true"
-              
-            - name: Configure CMake
-              run: cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -B "${{ github.workspace }}/build" ${{ matrix.cmake-args }}
-              env:
-                  CMAKE_PREFIX_PATH: ${{ env.Qt5_Dir }}
-                  WORKSPACE_DIR: ${{ github.workspace }}
-              
-            - name: Build
-              run: cmake --build "${{ github.workspace }}/build" --parallel 8
+  # Build job for Ubuntu
+  build-ubuntu:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Ubuntu 22-04 GCC
+            image: ubuntu-22.04
+            cc: gcc
+            cxx: g++
+            build-type: Debug
+            experimental: false
+          - name: Ubuntu 22-04 Clang
+            image: ubuntu-22.04
+            cc: clang
+            cxx: clang++
+            build-type: Debug
+            experimental: true
+          - name: Ubuntu 20-04 GCC  (for AppImage comp)
+            image: ubuntu-20.04
+            cc: gcc
+            cxx: g++
+            build-type: Debug
+            experimental: false
+
+    name: ${{ matrix.name }} ${{ matrix.build-type }}
+    runs-on: ${{ matrix.image }}
+    continue-on-error: ${{ matrix.experimental }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install Dependencies
+        run: sudo apt-get update && sudo apt-get install extra-cmake-modules qttools5-dev qttools5-dev-tools libsdl2-dev libxi-dev libxtst-dev libx11-dev itstool gettext ninja-build
+
+      - name: Configure CMake
+        run: cmake -GNinja -DCHECK_FOR_UPDATES=ON -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -B ${{ github.workspace }}/build
+        env:
+          CXX: ${{ matrix.cxx }}
+          CC: ${{ matrix.cc }}
+
+      - name: Build AntiMicroX
+        run: cmake --build ${{ github.workspace }}/build
+
+  # Build job for Windows
+  build-windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Windows Server 2019 MinGW
+            image: windows-2019
+            shell: msys2 {0}
+            build-type: Debug
+            qt-arch: "win64_mingw81"
+            experimental: false
+          - name: Windows Server 2019 MSVC
+            image: windows-2019
+            shell: cmd
+            cmake-args: -G "Visual Studio 16 2019" "-DSDL2_PATH=%WORKSPACE_DIR%/sdl2/" "-DSDL2_LIBRARY=%WORKSPACE_DIR%/sdl2/lib/x64/SDL2.lib" "-DSDL2_INCLUDE_DIR=%WORKSPACE_DIR%/sdl2/" "-DSDL2_DLL_LOCATION_DIR=%WORKSPACE_DIR%/sdl2/lib/x64/SDL2.dll"
+            build-type: Debug
+            qt-arch: "win64_msvc2019_64"
+            experimental: false
+    name: ${{ matrix.name }} ${{ matrix.build-type }}
+    runs-on: ${{ matrix.image }}
+    continue-on-error: ${{ matrix.experimental }}
+    defaults:
+      run:
+        shell: ${{ matrix.shell }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install Dependencies (msys2)
+        if: startsWith(matrix.shell, 'msys2')
+        uses: msys2/setup-msys2@v2
+        with:
+          install: >-
+            mingw-w64-x86_64-toolchain
+            mingw-w64-x86_64-ninja
+          msystem: mingw64
+          release: false
+      #mingw-w64-x86_64-SDL2 not installed above because of: https://github.com/AntiMicroX/antimicrox/issues/465
+      - name: Install sdl2 (mingw-w64)
+        if: startsWith(matrix.shell, 'msys2')
+        run: |
+          curl -L -o mingw-w64-x86_64-SDL2-2.30.1-1-any.pkg.tar.zst https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-SDL2-2.30.1-1-any.pkg.tar.zst
+          pacman --noconfirm -U mingw-w64-x86_64-SDL2-2.30.1-1-any.pkg.tar.zst
+
+      - name: Install sdl2 (msvc)
+        if: startsWith(matrix.shell, 'cmd')
+        run: |
+          curl -L -o SDL2-devel-2.30.1-VC.zip https://github.com/libsdl-org/SDL/releases/download/release-2.30.1/SDL2-devel-2.30.1-VC.zip
+          unzip SDL2-devel-2.30.1-VC.zip
+          mv "${{ github.workspace }}/SDL2-2.30.1" "${{ github.workspace }}/sdl2"
+          mklink /J "${{ github.workspace }}\sdl2\SDL2" "${{ github.workspace }}\sdl2\include"
+
+      - name: Install MSVC
+        if: startsWith(matrix.shell, 'cmd')
+        uses: TheMrMilchmann/setup-msvc-dev@v2
+        with:
+          arch: x64
+          toolset: 14.1
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: "5.15.2"
+          host: "windows"
+          target: "desktop"
+          arch: ${{ matrix.qt-arch }}
+          dir: "${{ github.workspace }}/qt/"
+          install-deps: "true"
+
+      - name: Configure CMake
+        run: cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -B "${{ github.workspace }}/build" ${{ matrix.cmake-args }}
+        env:
+          CMAKE_PREFIX_PATH: ${{ env.Qt5_Dir }}
+          WORKSPACE_DIR: ${{ github.workspace }}
+
+      - name: Build
+        run: cmake --build "${{ github.workspace }}/build" --parallel 8