Fix upload?

lukebemishprojects · Jul 16, 2024 · 94cbad9 · 94cbad9
1 parent eb15e44
commit 94cbad9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml
@@ -82,12 +82,12 @@ jobs:
         shell: msys2 {0}
         run: cmake --build cmakebuild --config ${{ matrix.build_type }}
       - uses: actions/upload-artifact@v4
-        if: ${{ matrix.os == 'windows' }}
+        if: ${{ matrix.msys }}
         with:
           name: ${{ matrix.os }}-${{ matrix.arch }}
           path: cmakebuild/${{ matrix.build_type }}/${{ matrix.libname }}
       - uses: actions/upload-artifact@v4
-        if: ${{ matrix.os != 'windows' }}
+        if: ${{ !matrix.msys }}
         with:
           name: ${{ matrix.os }}-${{ matrix.arch }}
           path: cmakebuild/${{ matrix.libname }}

diff --git a/toolchains/windows-aarch64.cmake b/toolchains/windows-aarch64.cmake
@@ -1,5 +1,6 @@
 set(CMAKE_SYSTEM_NAME  Windows)
 set(CMAKE_C_COMPILER   clang)
 set(CMAKE_CXX_COMPILER clang++)
+set(CMAKE_STATIC_LIBRARY_PREFIX "")
 set(CMAKE_C_FLAGS      "-march=armv8-a")
 set(CMAKE_CXX_FLAGS    "-march=armv8-a")
diff --git a/toolchains/windows-i386.cmake b/toolchains/windows-i386.cmake
@@ -1,5 +1,6 @@
 set(CMAKE_SYSTEM_NAME  Windows)
 set(CMAKE_C_COMPILER   i686-w64-mingw32-gcc-win32)
 set(CMAKE_CXX_COMPILER i686-w64-mingw32-g++-win32)
+set(CMAKE_STATIC_LIBRARY_PREFIX "")
 set(CMAKE_C_FLAGS      "-m32 -march=i386")
 set(CMAKE_CXX_FLAGS    "-m32 -march=i386")
diff --git a/toolchains/windows-x86_64.cmake b/toolchains/windows-x86_64.cmake
@@ -1,5 +1,6 @@
 set(CMAKE_SYSTEM_NAME  Windows)
 set(CMAKE_C_COMPILER   x86_64-w64-mingw32-gcc-win32)
 set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++-win32)
+set(CMAKE_STATIC_LIBRARY_PREFIX "")
 set(CMAKE_C_FLAGS      "-m64")
 set(CMAKE_CXX_FLAGS    "-m64")