fix cirrus ci yml

Author: Electrux

.cirrus.yml

@@ -6,24 +6,25 @@ task:
         DEBIAN_FRONTEND: noninteractive
     install_script: apt update && apt install --fix-missing -y git libgmp-dev libmpfr-dev libmpc-dev g++ cmake make wget valgrind && apt autoremove -y && apt autoclean -y
     compile_script:
-        - export CI=true; sh build.sh
+        - export CI=true; export NPROC=2; sh build.sh
     tests_script: ${HOME}/.feral/bin/feral testdir tests && ${HOME}/.feral/bin/feral testdir tests --valgrind
 
-task:
-    name: FreeBSD
-    freebsd_instance:
-        image_family: freebsd-13-0
-    install_script: pkg install -y git gmp mpfr mpc cmake wget valgrind
-    compile_script:
-        - export CI=true; sh build.sh
-    # valgrind causes invalid KERN_PROC_PATHNAME to be set therefore manually FERAL_PATHS is set
-    tests_script: ${HOME}/.feral/bin/feral testdir tests
+# FreeBSD-13 uses Clang 11 -_- ; Too old!
+# task:
+#     name: FreeBSD
+#     freebsd_instance:
+#         image_family: freebsd-13-0
+#     install_script: pkg install -y git gmp mpfr mpc cmake wget valgrind
+#     compile_script:
+#         - export CI=true; export NPROC=2; sh build.sh
+#     # valgrind causes invalid KERN_PROC_PATHNAME to be set therefore manually FERAL_PATHS is set
+#     tests_script: ${HOME}/.feral/bin/feral testdir tests
 
 task:
     name: macOS Monterey Apple LLVM 13.0.0
     macos_instance:
         image: ghcr.io/cirruslabs/macos-ventura-base:latest
     install_script: brew install git gmp mpfr libmpc cmake make
     compile_script:
-        - export CI=true; sh build.sh
+        - export CI=true; export NPROC=$(sysctl -n hw.ncpu); sh build.sh
     tests_script: ${HOME}/.feral/bin/feral testdir tests

build.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env sh
 echo '[INFO] Feral Installer - (c) Copyright 2020 Maximilian Götz (https://www.maxbits.net/)'
-echo '[INFO] Please make sure that Sudo, Git, CMake, LibGMP and LibMPFR are installed!'
-echo '[INFO] Installation started. Fetching system cores...'
+echo '[INFO] Please make sure that Git, CMake, LibGMP and LibMPFR are installed!'
 
 # Get current working directory
 CWD="$(pwd)"
@@ -29,23 +28,8 @@ if [ "$SYSNAME" = "Darwin" ]; then
     export CXXFLAGS="$CXXFLAGS -I$BREWGMP/include -I$BREWMPFR/include -I$BREWMPC/include"
     export LDFLAGS="$LDFLAGS -L$BREWGMP/lib -L$BREWMPFR/lib -L$BREWMPC/lib"
 fi
-CORES=1
-# Get system cores for faster build
-if [ "$SYSNAME" = "Linux" ]; then
-    CORES=$(nproc)
-else # for BSD and macOS
-    CORES=$(sysctl -n hw.ncpu)
-fi
-echo "[INFO] Using $CORES cores"
 
-echo '[INFO] Checking for Git, Sudo and CMake...'
-# No sudo on macOS since /usr/local is not usually root owned (as long as homebrew is installed)
-SUDO="sudo"
-if [ "$SYSNAME" = "Darwin" ] && hash brew 2>/dev/null || [ "$(id -u)" = "0" ]; then
-    SUDO=""
-else
-    echo '[INFO] Using sudo.'
-fi
+echo '[INFO] Checking for Git and CMake...'
 
 # Check for Git
 if hash git 2>/dev/null; then
@@ -55,16 +39,6 @@ else
     exit
 fi
 
-# Check for sudo
-if [ "$SUDO" = "sudo" ]; then
-    if hash sudo 2>/dev/null; then
-        echo '[INFO] sudo found.'
-    else
-        echo '[FATAL] sudo not available! Install it to continue! Aborting...'
-        exit
-    fi
-fi
-
 # Check for CMake
 if hash cmake 2>/dev/null; then
     echo '[INFO] CMake found.'
@@ -79,12 +53,14 @@ trap exit_handler INT
 
 build() {
     mkdir build && cd build
+    CORES=""
     if [ -n "$CI" ]; then
         export DISABLE_MARCH_NATIVE="true"
+        CORES="$NPROC"
     fi
     cmake .. -DCMAKE_BUILD_TYPE=Release
     if [ "$?" -ne 0 ]; then exit 1; fi
-    make -j$CORES install
+    make -j$NPROC install
     if [ "$?" -ne 0 ]; then exit 1; fi
     cd ..
 }