From ec8170cb40956501929983ee439e40b608583b1f Mon Sep 17 00:00:00 2001
From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com>
Date: Tue, 16 Apr 2024 23:00:10 -0400
Subject: [PATCH] ci: fix codeql prebuild steps for unix OSes (#2431)

---
 .codeql-prebuild-cpp-Linux.sh   | 3 ++-
 .codeql-prebuild-cpp-Windows.sh | 2 +-
 .codeql-prebuild-cpp-macOS.sh   | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.codeql-prebuild-cpp-Linux.sh b/.codeql-prebuild-cpp-Linux.sh
index 1ed7de55b6d..d00c671ec2c 100644
--- a/.codeql-prebuild-cpp-Linux.sh
+++ b/.codeql-prebuild-cpp-Linux.sh
@@ -1,4 +1,5 @@
 # install dependencies for C++ analysis
+set -e
 
 sudo apt-get update -y
 sudo apt-get install -y \
@@ -59,7 +60,7 @@ sudo rm /root/cuda.run
 mkdir -p build
 cd build || exit 1
 cmake -G "Unix Makefiles" ..
-mingw32-make -j"$(nproc)"
+make -j"$(nproc)"
 
 # skip autobuild
 echo "skip_autobuild=true" >> "$GITHUB_OUTPUT"
diff --git a/.codeql-prebuild-cpp-Windows.sh b/.codeql-prebuild-cpp-Windows.sh
index 04a7cc90645..034f07a8918 100644
--- a/.codeql-prebuild-cpp-Windows.sh
+++ b/.codeql-prebuild-cpp-Windows.sh
@@ -1,4 +1,5 @@
 # install dependencies for C++ analysis
+set -e
 
 # update pacman
 pacman --noconfirm -Suy
@@ -6,7 +7,6 @@ pacman --noconfirm -Suy
 # install dependencies
 pacman --noconfirm -S \
   base-devel \
-  cmake \
   diffutils \
   gcc \
   git \
diff --git a/.codeql-prebuild-cpp-macOS.sh b/.codeql-prebuild-cpp-macOS.sh
index 6c09330040a..4e74c8599e5 100644
--- a/.codeql-prebuild-cpp-macOS.sh
+++ b/.codeql-prebuild-cpp-macOS.sh
@@ -1,4 +1,5 @@
 # install dependencies for C++ analysis
+set -e
 
 # install dependencies
 brew install \
@@ -13,7 +14,7 @@ brew install \
 mkdir -p build
 cd build || exit 1
 cmake -G "Unix Makefiles" ..
-mingw32-make -j"$(sysctl -n hw.logicalcpu)"
+make -j"$(sysctl -n hw.logicalcpu)"
 
 # skip autobuild
 echo "skip_autobuild=true" >> "$GITHUB_OUTPUT"