From ba78d0c813494e6bd6c2445f2786be0e4adbb926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Mon, 13 Mar 2023 17:10:43 +0100 Subject: [PATCH] CI: adapt for new macOS runner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - enforce x86-64 architecture - use “sysctl -n hw.ncpu” instead of “nproc” (which has not been installed in the new runner) --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1bed9c8d..d1bab239 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,8 +54,8 @@ build_macos_x86_64: - macOS script: - autoreconf -si - - './configure CC=gcc-12 CXX=g++-12 LEX=/usr/local/opt/flex/bin/flex YACC=/usr/local/opt/bison/bin/bison' - - make -j$(nproc) + - 'arch -x86_64 ./configure CC=gcc-12 CXX=g++-12 LEX=/usr/local/opt/flex/bin/flex YACC=/usr/local/opt/bison/bin/bison' + - arch -x86_64 make -j$(sysctl -n hw.ncpu) artifacts: paths: - src/dynare-preprocessor