Merge branch 'pre5-patch'

Author: garethyr

.github/workflows/build-check.yml

@@ -0,0 +1,25 @@
+name: Continuous Integration
+
+on:
+  # Triggers the workflow for pushes to development, for pull request events, and for the merge queue
+  push:
+    branches: [development]
+  pull_request:
+    types: [opened, reopened, ready_for_review, synchronize]
+  merge_group:
+    types: [checks_requested]
+
+  workflow_dispatch:
+
+# Cancel in-progress runs if newer changes to the same branch/PR are pushed.
+concurrency:
+  group: ci-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  meson:
+    uses: ./.github/workflows/meson.yml
+    
+  msbuild:
+    uses: ./.github/workflows/msbuild.yml
+

.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+
+name: Master Build
+
+on:
+  # Triggers the workflow for pushes to master
+  push:
+    branches: [master]
+
+  workflow_dispatch:
+
+# Cancel in-progress runs if newer changes to the same branch/PR are pushed.
+concurrency:
+  group: ci-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+# Build the game on all platforms and store build artefacts of both jobs
+jobs:
+  meson:
+    uses: ./.github/workflows/meson.yml
+    with: 
+        upload_artefacts: true
+
+  msbuild:
+    uses: ./.github/workflows/msbuild.yml
+    with:
+        upload_artefacts: true
+

.github/workflows/master_build.yaml

@@ -1,22 +1,57 @@
 name: Meson Build (Linux, macOS)
-# Controls when the action will run.
+
 on:
-  # Triggers the workflow on push or pull request events but only for the development branch
-  push:
-    branches: [ master, development ]
-  release:
+  # Triggers the workflow when manually dispatched
   workflow_dispatch:
+    inputs:
+      upload_artefacts:
+        description: "Upload build artefacts"
+        type: boolean
+        required: false
+        default: false
+      build_type:
+        description: "Build Configuration"
+        type: choice
+        required: false
+        default: "release"
+        options:
+          - "release"
+          - "debug"
+      debug_level:
+        description: "Debug Level"
+        type: choice
+        required: false
+        default: "release"
+        options:
+          - "release"
+          - "minimal"
+          - "full"
+
+  # Triggers the workflow when called by a top-level workflow
+  workflow_call:
+    inputs:
+      upload_artefacts:
+        type: boolean
+        required: false
+        default: false
+      build_type: # "release" | "debug"
+        type: string
+        required: false
+        default: "release"
+      debug_level:  # "full" | "minimal" | "release" 
+        type: string
+        required: false
+        default: "release"
+
+env: 
+  MESON_VERSION: "0.60.3"
 
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
-  build-release-linux:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+  build-linux:
 
+    runs-on: ubuntu-latest
+    name: Linux Build
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
@@ -26,36 +61,44 @@ jobs:
         run: |
           sudo apt-get update -yq
           sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev libtbb-dev libsdl2-dev libopengl-dev libfuse2 ninja-build
-          sudo pip install meson==0.60.0
+          sudo pip install meson==${{env.MESON_VERSION}}
 
-      - name: Install Clang
-        # You may pin to the exact commit or the version.
-        # uses: egor-tensin/setup-clang@d16e36d5f8a7eb00aa6627c1a536d94dfc4a913d
-        uses: egor-tensin/setup-clang@v1
-        with:
-          # Set up cc/c++ executables
-          cc: 1 # optional, default is 1
+      - name: Setup Meson
+        env:
+          CC: "gcc"
+          CXX: "g++"
+        run: |
+          meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} build
 
+      - name: Configure for AppImage
+        if: ${{inputs.upload_artefacts}}
+        env:
+          CC: "gcc"
+          CXX: "g++"
+        run: meson configure -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/ build
+          
       - name: Build
         env:
           CC: "gcc"
           CXX: "g++"
         run: |
-          meson setup --buildtype=release -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/ build
           meson compile -C build
-
+        
       - name: Create AppDir
+        if: ${{inputs.upload_artefacts}}
         run: |
           echo "Setting output prefix"
           DESTDIR=${GITHUB_WORKSPACE}/build/AppDir meson install -C $GITHUB_WORKSPACE"/build"
 
       - name: Download linuxdeploy
+        if: ${{inputs.upload_artefacts}}
         working-directory: ${{env.GITHUB_WORKSPACE}}
         run: |
           wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage -O lindeploy
           chmod +x lindeploy
 
       - name: Create AppImage
+        if: ${{inputs.upload_artefacts}}
         working-directory: ${{env.GITHUB_WORKSPACE}}
         env:
           LD_LIBRARY_PATH: ./external/lib/linux/x86_64/
@@ -65,33 +108,40 @@ jobs:
           ./lindeploy --appdir=build/AppDir --output appimage
 
       - name: Upload Appimage
+        if: ${{inputs.upload_artefacts}}
         uses: actions/upload-artifact@v3
         with:
           name: CortexCommand (Linux)
           path: CortexCommand.AppImage
+          if-no-files-found: error
 
-  build-release-macos:
+  build-macos:
     runs-on: macos-latest
+    name: MacOS Build
 
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
 
       - name: Install Dependencies
         run: |
-          brew install pkg-config tbb sdl2 minizip lz4 flac luajit [email protected] libpng gcc ninja meson
-
+          brew install pkg-config tbb sdl2 minizip lz4 flac luajit [email protected] libpng gcc@12 ninja meson
+          
       - name: Build
         env:
           CC: "gcc-12"
           CXX: "g++-12"
           LDFLAGS: "-static-libgcc -static-libstdc++"
         run: |
-          meson setup --buildtype=release -Ddebug_type=release build
+          meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}}  build
           meson compile -C build
 
       - name: Artifact Deploy
+        if: ${{inputs.upload_artefacts}}
         uses: actions/upload-artifact@v3
         with:
           name: CortexCommand (macOS)
-          path: build/CortexCommand
+          path: |
+            build/CortexCommand
+            build/CortexCommand_debug
+          if-no-files-found: error