Merge branch 'development' into zip-save-files

Author: Causeless

.git-blame-ignore-revs

@@ -13,3 +13,7 @@ b22c5ab241f040a16ef502a8b5f2bca125368060
 f701bc23cfae7c1cafc48070d986ba16a5873416
 5efd90188ede818ed42fee06bb65f29cb892c54f
 b21b546e2dc9062b1918e7e01d517a537437bbc4
+d7fadcc33a4dc18c5bc214f4930011f073f1d8f5
+ed9fe94aca5e514a13e3c551e30af3862a31b0b5
+1578aaf760454156359e295bd8b498f744f3ecd7
+0d9d14f0e7a2a1326dd143652cbb74609966956f

.github/actions/bundle_release/action.yaml

@@ -7,7 +7,7 @@ runs:
       shell: bash
 
     - name: Download build artefacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         path: release
 
@@ -18,12 +18,14 @@ runs:
       shell: bash
       run: |
         zip --must-match -j CortexCommand.windows.zip \
-          release/Cortex\ Command*.exe/Cortex\ Command*.exe \
+          release/Cortex\ Command*/Cortex\ Command*.exe \
+          release/Cortex\ Command*/Cortex\ Command*.pdb \
           external/lib/win/{fmod,SDL2}.dll
 
     - name: Compress Linux Release
       shell: bash
       run: |
+        chmod +x "release/CortexCommand (Linux)/CortexCommand.AppImage"
         zip --must-match -j CortexCommand.linux.zip \
           "release/CortexCommand (Linux)/CortexCommand.AppImage" \
           external/lib/linux/x86_64/libfmod.so*

.github/actions/get-game-version/action.yaml

@@ -0,0 +1,21 @@
+name: 'Get Game version Version'
+description: 'Fetches the current game version from the source code'
+
+inputs:
+  version-file:
+    description: 'The file containing the version string'
+    required: false
+    default: Source/System/GameVersion.h
+
+outputs:
+  game-version:
+    description: 'The current version string'
+    value: ${{ steps.read-version.outputs.game-version }}
+
+runs:
+  using: "composite"
+  steps:
+    - name: Get the current Game Version from the source code
+      id: read-version
+      run: echo "game-version=$(grep 'c_VersionString = ' ${{ inputs.version-file }} | awk -F'"' '{print $2}')" >> $GITHUB_OUTPUT 
+      shell: bash

.github/actions/osxcross/action.yml

@@ -0,0 +1,154 @@
+name: "Setup osxcross"
+author: mbround18
+description: Setup osxcross for rust/other compilation projects.
+branding:
+  icon: 'aperture'  
+  color: 'green'
+
+
+inputs:
+  osx-version:
+    description: "Version of osx to use."
+    required: true
+
+outputs:
+  legacy-ssl:
+    value: ${{steps.gen_configs.outputs.legacy-ssl}}
+  meson-osxcross:
+    value: ${{steps.gen_configs.outputs.meson-osxcross}}
+
+runs:
+  using: "composite"
+  steps:
+    - shell: bash
+      run: |
+        mkdir -p $GITHUB_ACTION_PATH/osxcross
+        echo "OSXCROSS_FOLDER=$(echo "$GITHUB_ACTION_PATH/osxcross" | sed 's/\.\/*//g')" >> $GITHUB_ENV
+
+
+    - uses: actions/checkout@v4
+      with:
+        repository: tpoechtrager/osxcross
+        path: ${{env.OSXCROSS_FOLDER}}
+
+    - shell: bash
+      id: target
+      run: |
+        repeat(){
+          for i in {1..90}; do echo -n "$1"; done
+        }
+
+        echo "::group::Disclaimer Click Here for Info"
+        echo ""
+        repeat "-"
+        echo ""
+        echo "The first time you run this it will take upwards of 9 minutes to compile. Subsequent builds are cached."
+        echo ""
+        repeat "-"
+        echo ""
+        echo "::endgroup::"
+
+
+        echo "::group::Installing Deps"
+
+        sudo apt-get update
+        sudo apt-get install --no-install-recommends -y -qq clang gcc g++ zlib1g-dev libmpc-dev libmpfr-dev libgmp-dev  cmake libxml2-dev libssl-dev xz-utils 
+        echo "::endgroup::"
+
+        # Check setup for osx version
+        echo "::group::Fetching macosx SDK"
+        FILE_NAME="MacOSX${{ inputs.osx-version }}.sdk.tar.xz"
+
+        # Check joseluisq/macosx-sdks for release
+        wget -nc "https://github.com/joseluisq/macosx-sdks/releases/download/${{ inputs.osx-version }}/${FILE_NAME}" -O "$OSXCROSS_FOLDER/tarballs/${FILE_NAME}"
+        echo "::endgroup::"
+
+        echo "OSXCROSS_TARGET=${OSXCROSS_FOLDER}/target" >> $GITHUB_ENV
+
+    - uses: actions/cache@v4
+      id: cache
+      with:
+        key: ${{ runner.os }}-osxcross-${{ inputs.osx-version }}
+        path: |
+          ${{ env.OSXCROSS_TARGET }}
+          
+
+    - shell: bash
+      if: steps.cache.outputs.cache-hit != 'true'
+      env:
+        SDK_VERSION: "${{ inputs.osx-version }}"
+        UNATTENDED: "yes"
+      run: |
+        cd ${OSXCROSS_FOLDER}
+        echo "::group::Build osxcross"
+        ./build.sh
+        echo "::endgroup::"
+        echo "::group::Build GCC"
+        ./build_gcc.sh
+        echo "::endgroup::"
+
+    - shell: bash
+      id: gen_configs
+      run: |
+        echo "::group::Setting up Bin files"
+        OSXCROSS_FOLDER="$(echo "${GITHUB_ACTION_PATH}/osxcross" | sed 's/\.\/*//g')"
+        echo "OSXCROSS Folder = ${OSXCROSS_FOLDER}"
+
+        if [ ! -d "$OSXCROSS_FOLDER/target/bin" ]; then
+          echo "Error! Failed to find ${OSXCROSS_FOLDER}/target/bin folder!"
+          exit 1
+        else
+          if hash sudo 2>/dev/null; then
+            sudo chmod +x $OSXCROSS_FOLDER/target/bin/*
+          else
+            chmod +x $OSXCROSS_FOLDER/target/bin/*
+          fi
+        fi        
+        echo "::endgroup::"
+
+        echo "::group::Finding Arch Name"
+        echo "$OSXCROSS_FOLDER/target/bin" >> $GITHUB_PATH
+        ARCH_TARGET="$(ls $OSXCROSS_FOLDER/target | grep apple)"
+        echo "::endgroup::"
+
+        ln -sf ${ARCH_TARGET}-otool ${OSXCROSS_TARGET}/bin/otool
+        ln -sf ${ARCH_TARGET}-install_name_tool ${OSXCROSS_TARGET}/bin/install_name_tool
+
+        echo "::group::Write meson cross file"
+        cat << EOF > $OSXCROSS_FOLDER/meson_osxcross.txt
+        [constants]
+        arch = '${ARCH_TARGET}'
+        [binaries]
+        c = ['ccache', arch + '-gcc']
+        cpp = ['ccache', arch + '-g++']
+        strip = arch + '-strip'
+        pkg-config = arch  + '-pkg-config'
+        ranlib = arch + '-gcc-ranlib'
+        ar = arch + '-gcc-ar'
+        
+        [host_machine]
+        system = 'darwin'
+        cpu_family = 'x86_64'
+        cpu = 'x86_64'
+        endian = 'little'
+        EOF
+        echo "::endgroup::"
+
+        echo "meson-osxcross=${OSXCROSS_FOLDER}/meson_osxcross.txt" >> $GITHUB_OUTPUT
+
+    - shell: bash
+      run: |
+        OUT=$(patch -N -i ${GITHUB_ACTION_PATH}/macports.patch ${OSXCROSS_FOLDER}/target/bin/osxcross-macports) || echo "${OUT}" | grep "Skipping patch" -q || (echo "$OUT" && false);
+
+    - uses: actions/checkout@v4
+      with:
+        repository: auriamg/macdylibbundler
+        path: ${{env.OSXCROSS_FOLDER}}/dylibbundler
+
+    - shell: bash
+      run: |
+        echo "::group::Install dylibbundler"
+        cd ${OSXCROSS_FOLDER}/dylibbundler
+        make
+        echo "${OSXCROSS_FOLDER}/dylibbundler" >> $GITHUB_PATH
+        echo "::endgroup::"

.github/actions/osxcross/macports.patch

@@ -0,0 +1,26 @@
+diff --git a/tools/osxcross-macports b/tools/osxcross-macports
+index 3e87735..5c48e4e 100755
+--- a/tools/osxcross-macports
++++ b/tools/osxcross-macports
+@@ -250,8 +250,10 @@ verifyFileIntegrity()
+     getFile $PUBKEYURL "$PUBKEY"
+   fi
+ 
+-  local rmd160=$(openssl rmd160 "$PUBKEY" | awk '{print $2}')
+-  local sha1=$(openssl sha1 "$PUBKEY" | awk '{print $2}')
++  errorMsg "set rmd160"
++  local rmd160=$(openssl rmd160 -provider legacy "$PUBKEY" | awk '{print $2}')
++  errorMsg "set sha1"
++  local sha1=$(openssl sha1 "$PUBKEY" | awk '{print $2}')
+ 
+   if [ "$rmd160" != "$PUBKEYRMD160" -o "$sha1" != "$PUBKEYSHA1" ]; then
+     errorMsg "invalid macports public key (hash check failed)"
+@@ -262,7 +264,7 @@ verifyFileIntegrity()
+ 
+   set +e
+ 
+-  openssl dgst -ripemd160 -verify "$PUBKEY" -signature \
++  openssl dgst -provider legacy -provider default -ripemd160 -verify "$PUBKEY" -signature \
+     "$CACHE/$file.rmd160" "$CACHE/$file" 1>/dev/null
+ 
+   if [ $? -ne 0 ]; then

.github/actions/set_version/action.yaml

@@ -11,7 +11,7 @@ runs:
       run: sed -i -E '/c_VersionString = /s/"[^"]*"/"${{inputs.new_release_version}}"/' Source/System/GameVersion.h
       shell: bash
 
-    - uses: actions/setup-python@v3
+    - uses: actions/setup-python@v5
 
     - name: Rewrite meson version
       run: |

.github/parameters/macports.yml

@@ -12,4 +12,5 @@ ports:
   - name: luajit
   - name: flac
   - name: dylibbundler
-  - name: tree
+  - name: tree
+  - name: ccache

.github/workflows/clang-format.yml

@@ -27,15 +27,19 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
 
       - name: Install dependencies
-        run: sudo apt-get install -y clang-format
+        run: |
+          mkdir bin
+          wget https://github.com/muttleyxd/clang-tools-static-binaries/releases/download/master-8f72ab3c/clang-format-17_linux-amd64 -O bin/clang-format-17
+          chmod +x bin/clang-format-17
 
       - name: Run clang-format
         run: |
             .github/scripts/run-clang-format.py \
+                --clang-format-executable bin/clang-format-17 \
                 -i \
                 -r Source Data/Base.rte/Shaders \
                 --exclude Source/System/Base64 \
@@ -47,7 +51,8 @@ jobs:
       - name: Add missing newlines
         run: |
             .github/scripts/run-clang-format.py \
-                -i --clang-format-executable .github/scripts/add-eol.sh \
+                --clang-format-executable .github/scripts/add-eol.sh \
+                -i \
                 -r Source Data/Base.rte/Shaders \
                 --exclude Source/System/Base64 \
                 --exclude Source/System/BitMask \