Merge pull request #4 from Norrox/cicd-mono

a fix for the mono artifacts not uploading
merlin-engine · Nov 2, 2024 · 1121242 · 1121242
2 parents 150d819 + 5a843c3
commit 1121242
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
@@ -23,6 +23,17 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - name: Editor (target=editor tests=yes)
+            cache-name: linux-editor
+            target: editor
+            bin: ./bin/merlin.linuxbsd.editor.x86_64
+            build-mono: false
+            tests: true
+            doc-test: true
+            proj-conv: true
+            api-compat: true
+            artifact: true
+
           - name: Editor w/ Mono (target=editor)
             cache-name: linux-editor-mono
             target: editor

diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
@@ -43,6 +43,7 @@ jobs:
             proj-conv: true
             api-compat: true
             artifact: true
+            compiler: msvc
 
           - name: Editor w/ clang-cl (target=editor, tests=yes, use_llvm=yes)
             cache-name: windows-editor-clang
@@ -130,6 +131,7 @@ jobs:
 
       - name: Prepare artifact
         if: matrix.compiler == 'msvc'
+        shell: pwsh
         run: |
           Remove-Item bin/* -Include *.exp,*.lib,*.pdb -Force
 
@@ -138,6 +140,7 @@ jobs:
         uses: ./.github/actions/upload-artifact
         with:
           name: ${{ matrix.cache-name }}
+          path: bin/**
 
       - name: Unit tests
         if: matrix.tests