From 94cbad9b40f51834a18434a35778ae60c4acf55f Mon Sep 17 00:00:00 2001 From: Luke Bemish Date: Mon, 15 Jul 2024 22:58:31 -0500 Subject: [PATCH] Fix upload? --- .github/workflows/commit.yml | 4 ++-- toolchains/windows-aarch64.cmake | 1 + toolchains/windows-i386.cmake | 1 + toolchains/windows-x86_64.cmake | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml index f6a0dc3..e02520f 100644 --- 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 index aa7bfb2..3520084 100644 --- 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") \ No newline at end of file diff --git a/toolchains/windows-i386.cmake b/toolchains/windows-i386.cmake index 054afee..36117f0 100644 --- 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") \ No newline at end of file diff --git a/toolchains/windows-x86_64.cmake b/toolchains/windows-x86_64.cmake index a724164..406444e 100644 --- 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") \ No newline at end of file