From a50a9fcf9a0d34279442dc7af0eb2583a88cd2d3 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Fri, 19 Aug 2022 01:10:50 -0500 Subject: [PATCH] GHActions: CMake builds are SSE4 --- .github/workflows/scripts/common/name-artifacts.sh | 2 +- .github/workflows/windows_build_matrix.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scripts/common/name-artifacts.sh b/.github/workflows/scripts/common/name-artifacts.sh index dd2e6618f..584b7193e 100755 --- a/.github/workflows/scripts/common/name-artifacts.sh +++ b/.github/workflows/scripts/common/name-artifacts.sh @@ -21,7 +21,7 @@ NAME="" if [ "${OS}" == "macos" ]; then NAME="PCSX2-${OS}-${GUI_FRAMEWORK}" -elif [[ "${OS}" == "windows" || ("$OS" == "linux" && "$GUI_FRAMEWORK" == "QT") ]]; then +elif [[ ("${OS}" == "windows" && "$BUILD_SYSTEM" != "cmake") || ("$OS" == "linux" && "$GUI_FRAMEWORK" == "QT") ]]; then NAME="PCSX2-${OS}-${GUI_FRAMEWORK}-${ARCH}-${SIMD}" else NAME="PCSX2-${OS}-${GUI_FRAMEWORK}-${ARCH}" diff --git a/.github/workflows/windows_build_matrix.yml b/.github/workflows/windows_build_matrix.yml index 1b58df7a5..435b6d76a 100644 --- a/.github/workflows/windows_build_matrix.yml +++ b/.github/workflows/windows_build_matrix.yml @@ -58,8 +58,8 @@ jobs: secrets: inherit # CMAKE - build_wx_avx2_cmake: - name: "CMake AVX2" + build_wx_sse4_cmake: + name: "CMake SSE4" uses: ./.github/workflows/windows_build_wx.yml with: jobName: wxWidgets