- Update vcpkg

- Fix custom github actions - Possible fix for Windows workflows - Add new presets (Fools Edition)
MadDeCoDeR · Mar 31, 2024 · cd98b17 · cd98b17
1 parent 32dd1d1
commit cd98b17
Show file tree

Hide file tree

Showing 7 changed files with 108 additions and 88 deletions.
diff --git a/.github/actions/package_formatter/action.yml b/.github/actions/package_formatter/action.yml
@@ -1,50 +1,47 @@
-name: Package Formatter
+name: 'Package Formatter'
+description: 'Format workflow artifact to release packages'
+inputs:
+    artifact_name:
+        required: true
+        type: string
+    upload_url:
+        required: true
+        type: string
+    commands:
+        required: true
+        type: string
 
-on:
-    workflow_call:
-        inputs:
-            artifact_name:
-                required: true
-                type: string
-            upload_url:
-                required: true
-                type: string
-            commands:
-                required: true
-                type: string
-
-jobs:
-    format_and_upload:
-        runs-on: ubunut-latest
-        steps:
-            - name: Download artifact
-              uses: actions/download-artifact@v3
-              with:
-                name: ${{inputs.artifact_name}}
-            - name: Zip artifact files
-              working-directory: ${{github.workspace}}
-              run: |
-                mv ./build/DoomBFA DoomBFA
-                mv ./base/DoomBFA.sh DoomBFA.sh
-                cp -r -u  -f ./BFA_Assets/* .
-                rm -r ./BFA_Assets
-                rm -r ./base/renderprogs
-                mkdir ./third-party-licenses
-                mv ./build/vcpkg_installed/x64-linux/share/* ./third-party-licenses
-                chmod +x DoomBFA
-                chmod +x DoomBFA.sh
-                rm -d -R ./build
-                ${{inputs.commands}}
-                zip -m -r ${{inputs.artifact_name}}.zip .
-            - name: Upload Artifact to release
-              uses: actions/upload-release-asset@v1
-              env:
-                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              with:
-                upload_url: ${{ inputs.upload_url }}
-                asset_path: ${{github.workspace}}/${{inputs.artifact_name}}.zip
-                asset_name: ${{inputs.artifact_name}}.zip
-                asset_content_type: application/zip
-            - name: Delete artifact zip file
-              working-directory: ${{github.workspace}}
-              run: rm ${{inputs.artifact_name}}.zip
+runs:
+  using: "composite"
+  steps:
+      - name: Download artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: ${{inputs.artifact_name}}
+      - name: Zip artifact files
+        working-directory: ${{github.workspace}}
+        run: |
+          mv ./build/DoomBFA DoomBFA
+          mv ./base/DoomBFA.sh DoomBFA.sh
+          cp -r -u  -f ./BFA_Assets/* .
+          rm -r ./BFA_Assets
+          rm -r ./base/renderprogs
+          mkdir ./third-party-licenses
+          mv ./build/vcpkg_installed/x64-linux/share/* ./third-party-licenses
+          chmod +x DoomBFA
+          chmod +x DoomBFA.sh
+          rm -d -R ./build
+          ${{inputs.commands}}
+          zip -m -r ${{inputs.artifact_name}}.zip .
+      - name: Upload Artifact to release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ inputs.upload_url }}
+          asset_path: ${{github.workspace}}/${{inputs.artifact_name}}.zip
+          asset_name: ${{inputs.artifact_name}}.zip
+          asset_content_type: application/zip
+      - name: Delete artifact zip file
+        working-directory: ${{github.workspace}}
+        run: rm ${{inputs.artifact_name}}.zip
diff --git a/.github/actions/upload_artifact/action.yml b/.github/actions/upload_artifact/action.yml
@@ -1,37 +1,32 @@
-name: Upload Artifact
-
-on:
-    workflow_call:
-        inputs:
-            artifact_name:
-                required: true
-                type: string
-            executable_path:
-                required: true
-                type: string
-            vcpkg_triplet:
-                required: true
-                type: string
-        outputs:
-            artifact_name:
-
-jobs:
-    upload_artifact:
-        runs-on: ubuntu-latest
-        outputs:
-            artifact_name: ${{inputs.artifact_name}}
-
-        steps:
-          - name: Archive production artifacts
-            uses: actions/upload-artifact@v3
-            with:
-              name: ${{inputs.artifact_name}}
-              path: |
-                ${{inputs.executable_path}}
-                ./build/vcpkg_installed/${{inputs.vcpkg_triplet}}/share/*/copyright
-                ./base/*
-                ./BFA_Assets/*
-                ./base_new/*
-                ./COPYING.txt
-                ./alsoft.ini
-                ./README.md
+name: 'Upload Artifact'
+description: 'Package and upload an artiofact to the workflow storage'
+inputs:
+    artifact_name:
+        required: true
+        type: string
+    executable_path:
+        required: true
+        type: string
+    vcpkg_triplet:
+        required: true
+        type: string
+outputs:
+    artifact_name: 
+        description: 'Echo of the input'  
+        value: ${{inputs.artifact_name}}
+runs:
+    using: "composite"
+    steps:
+        - name: Archive production artifacts
+          uses: actions/upload-artifact@v3
+          with:
+            name: ${{inputs.artifact_name}}
+            path: |
+            ${{inputs.executable_path}}
+            ./build/vcpkg_installed/${{inputs.vcpkg_triplet}}/share/*/copyright
+            ./base/*
+            ./BFA_Assets/*
+            ./base_new/*
+            ./COPYING.txt
+            ./alsoft.ini
+            ./README.md
diff --git a/.github/workflows/cmake_linux_x64.yml b/.github/workflows/cmake_linux_x64.yml
@@ -36,7 +36,7 @@ jobs:
 
         - name: Download Depedencies
           id: step4
-          run: sudo apt-get install -y libglu1-mesa-dev freeglut3-dev mesa-common-dev libxmu-dev libxi-dev libgl-dev libx11-dev libxft-dev libxext-dev nasm libwayland-dev libxkbcommon-dev libegl1-mesa-dev libdecor-0-dev libxrandr-dev
+          run: sudo apt-get install -y libglu1-mesa-dev freeglut3-dev mesa-common-dev libxmu-dev libxi-dev libgl-dev libx11-dev libxft-dev libxext-dev nasm libwayland-dev libxkbcommon-dev libegl1-mesa-dev libdecor-0-dev libxrandr-dev python3-jinja2
 
         - name: Cache linux vcpkg
           id: step5

diff --git a/.github/workflows/cmake_windows_x64.yml b/.github/workflows/cmake_windows_x64.yml
@@ -40,6 +40,7 @@ jobs:
     
         - name: Configure CMake
           working-directory: ${{github.workspace}}/neo
+          shell: powershell
           run: cmake -B ${{github.workspace}}/build --preset=windows-x64-2022
 
         - name: Build

diff --git a/.github/workflows/cmake_windows_x86.yml b/.github/workflows/cmake_windows_x86.yml
@@ -40,6 +40,7 @@ jobs:
 
             - name: Configure CMake
               working-directory: ${{github.workspace}}/neo
+              shell: powershell
               run: cmake -B ${{github.workspace}}/build --preset=windows-x86-2022
 
             - name: Build

diff --git a/neo/CMakePresets.json b/neo/CMakePresets.json
@@ -115,6 +115,19 @@
       "inherits": "windows-x64-base",
       "generator": "Visual Studio 17"
     },
+    {
+      "name": "windows-x64-2022-fools",
+      "displayName": "VS2022: 64-bit Windows (Fools Edition)",
+      "inherits": "windows-x64-base",
+      "binaryDir": "${sourceParentDir}/buildx64Fools",
+      "generator": "Visual Studio 17",
+      "cacheVariables": {
+        "USE_FOOLS": {
+          "type": "BOOL",
+          "value": "ON"
+        }
+      }
+    },
     {
       "name": "windows-x64-2022-legacy",
       "displayName": "VS2022: 64-bit Windows Legacy Mode",
@@ -140,6 +153,19 @@
       "inherits": "windows-x86-base",
       "generator": "Visual Studio 17"
     },
+    {
+      "name": "windows-x86-2022-fools",
+      "displayName": "VS2022: 32-bit Windows (Fools Edition)",
+      "inherits": "windows-x86-base",
+      "binaryDir": "${sourceParentDir}/buildx86Fools",
+      "generator": "Visual Studio 17",
+      "cacheVariables": {
+        "USE_FOOLS": {
+          "type": "BOOL",
+          "value": "ON"
+        }
+      }
+    },
     {
       "name": "linux-base",
       "hidden": true,

diff --git a/vcpkg b/vcpkg