Use nim v1.6+ (#12)

* Use nim v1.6+

nim-stew now requires nim >= 1.6, so nim-leopard must be bumped

* Use macos-13 (intel) runner image instead of arm
* change 1.2 to 1.6 in readme and .nimble
This commit is contained in:
Eric 2024-06-20 13:20:55 +10:00 committed by GitHub
parent 1a6f2ab725
commit 4d4fdf6210
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 13 deletions

View File

@ -10,28 +10,31 @@ jobs:
fail-fast: false
matrix:
cache_nonce: [ 1 ]
nim_version: [ 1.2.18, 1.4.8, 1.6.6 ]
nim_version: [ 1.6.20 ] # add stable for testing 2.0+
platform:
- {
icon: 🐧,
label: Linux,
os: ubuntu,
runner: ubuntu-latest,
shell: bash --noprofile --norc -eo pipefail
}
- {
icon: 🍎,
label: macOS,
os: macos,
runner: macos-13, # x86
shell: bash --noprofile --norc -eo pipefail
}
- {
icon: 🏁,
label: Windows,
os: windows,
runner: windows-latest,
shell: msys2
}
name: ${{ matrix.platform.icon }} ${{ matrix.platform.label }} - Nim v${{ matrix.nim_version }}
runs-on: ${{ matrix.platform.os }}-latest
runs-on: ${{ matrix.platform.runner }}
defaults:
run:
shell: ${{ matrix.platform.shell }} {0}
@ -142,15 +145,8 @@ jobs:
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'"
fi
if [[ ${{ matrix.nim_version }} = 1.2.* ]]; then
eval nimble --verbose test -d:release --gc:refc ${compiler_extra_options}
elif [[ ${{ matrix.nim_version }} = 1.4.* ]]; then
eval nimble --verbose test -d:release --gc:refc ${compiler_extra_options}
eval nimble --verbose test -d:release --gc:orc ${compiler_extra_options}
else
eval nimble --verbose test -d:release --mm:refc ${compiler_extra_options}
eval nimble --verbose test -d:release --mm:orc ${compiler_extra_options}
fi
eval nimble --verbose test -d:release --mm:refc ${compiler_extra_options}
eval nimble --verbose test -d:release --mm:orc ${compiler_extra_options}
if [[ ${{ matrix.platform.os }} = macos ]]; then
echo
echo otool -L tests/testleopard

View File

@ -10,7 +10,7 @@ Nim wrapper for [Leopard-RS](https://github.com/catid/leopard): a fast library f
## Requirements
* Same as Leopard-RS' requirements, e.g. CMake 3.7 or newer.
* Nim 1.2 or newer.
* Nim 1.6 or newer.
## Installation

View File

@ -7,7 +7,7 @@ description = "A wrapper for Leopard-RS"
license = "Apache License 2.0 or MIT"
installDirs = @["vendor"]
requires "nim >= 1.2.0",
requires "nim >= 1.6.0",
"stew",
"unittest2",
"upraises >= 0.1.0 & < 0.2.0"