From 957d976ddb39f385d4cbe5437ec879de17de325e Mon Sep 17 00:00:00 2001 From: Eric <5089238+emizzle@users.noreply.github.com> Date: Wed, 12 Jun 2024 12:44:19 +1000 Subject: [PATCH] change version to 1.6.20 and stable, and disable openmp on macos As per comment https://github.com/status-im/leopard/pull/1#issuecomment-1146601769 --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cb95c4f..68c8238 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: fail-fast: false matrix: cache_nonce: [ 1 ] - nim_version: [ 1.6, 2.0 ] + nim_version: [ 1.6.20, stable ] platform: - { icon: 🐧, @@ -140,7 +140,7 @@ jobs: if [[ ${{ matrix.platform.os }} = macos ]]; then export PATH="$(brew --prefix llvm@14)/bin:${PATH}" export LDFLAGS="-L$(brew --prefix libomp)/lib -L$(brew --prefix llvm@14)/lib -Wl,-rpath,$(brew --prefix llvm@14)/lib" - compiler_extra_options="-d:LeopardCmakeFlags='-DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=$(brew --prefix llvm@14)/bin/clang -DCMAKE_CXX_COMPILER=$(brew --prefix llvm@14)/bin/clang++' -d:LeopardExtraCompilerlags='-fopenmp' -d:LeopardExtraLinkerFlags='-fopenmp -L$(brew --prefix libomp)/lib'" + compiler_extra_options="-d:LeopardCmakeFlags='-DENABLE_OPENMP=off -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=$(brew --prefix llvm@14)/bin/clang -DCMAKE_CXX_COMPILER=$(brew --prefix llvm@14)/bin/clang++' -d:LeopardExtraCompilerlags='-fopenmp' -d:LeopardExtraLinkerFlags='-fopenmp -L$(brew --prefix libomp)/lib'" fi eval nimble --verbose test -d:release --mm:refc ${compiler_extra_options} eval nimble --verbose test -d:release --mm:orc ${compiler_extra_options}