one more time

gliwka · Nov 24, 2023 · 7f0920b · 7f0920b
1 parent 1c240e5
commit 7f0920b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,11 +30,11 @@ jobs:
             shell: msys2 {0}
             platform: windows-x86_64
           - os: macos
-            runner: macos-latest
+            runner: macos-12 #x86_64
             shell: bash
             platform: macosx-x86_64
           - os: macos
-            runner: macos-latest
+            runner: macos-12-large #arm64
             shell: bash
             platform: macosx-arm64
           - os: linux

diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,5 @@ cppbuild/
 
 #test artifacts
 db
+
+.DS_Store
diff --git a/build.sh b/build.sh
@@ -71,27 +71,20 @@ cd ..
 
 cd vectorscan
 
+# Disable flakey sqlite detection - only needed to build auxillary tools anyways.
+> cmake/sqlite3.cmake
+
 case $DETECTED_PLATFORM in
-linux-x86_64)
-  CC="clang" CXX="clang++" cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$(pwd)/.." -DCMAKE_INSTALL_LIBDIR="lib" -DPCRE_SOURCE="." -DFAT_RUNTIME=on -DBUILD_SHARED_LIBS=on .
-  make -j $THREADS
-  make install/strip
-  ;;
-linux-arm64)
+linux-x86_64|linux-arm64)
   CC="clang" CXX="clang++" cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$(pwd)/.." -DCMAKE_INSTALL_LIBDIR="lib" -DPCRE_SOURCE="." -DFAT_RUNTIME=on -DBUILD_SHARED_LIBS=on .
   make -j $THREADS
   make install/strip
   ;;
-macosx-x86_64)
+macosx-x86_64|macosx-arm64)
   cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$(pwd)/.." -DCMAKE_INSTALL_LIBDIR="lib" -DARCH_OPT_FLAGS='-Wno-error' -DPCRE_SOURCE="." -DBUILD_SHARED_LIBS=on .
   make -j $THREADS
   make install/strip
   ;;
-macosx-arm64)
-  CFLAGS="-target arm64-apple-macos11" CXXFLAGS="-target arm64-apple-macos11" cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$(pwd)/.." -DCMAKE_INSTALL_LIBDIR="lib" -DARCH_OPT_FLAGS='-Wno-error' -DPCRE_SOURCE="." -DBUILD_SHARED_LIBS=on .
-  make -j $THREADS
-  make install/strip
-  ;;
 windows-x86_64)
   unset TEMP TMP # temp is defined in uppercase by bash and lowercase by windows, which causes problems with cmake + msbuild
   CXXFLAGS="/Wv:17" cmake -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$(pwd)/.." -DCMAKE_INSTALL_LIBDIR="lib" -DARCH_OPT_FLAGS='' -DPCRE_SOURCE="." -DBUILD_SHARED_LIBS=on .
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,3 +34,5 @@ cppbuild/

		#test artifacts
		db

		.DS_Store