update ci.yml and be more explicit in .nimble (#72)

This commit is contained in:
Miran 2024-06-26 12:12:02 +02:00 committed by GitHub
parent 005ee90cb6
commit 298a9554a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 4 deletions

View File

@ -22,17 +22,25 @@ jobs:
cpu: i386 cpu: i386
- os: macos - os: macos
cpu: amd64 cpu: amd64
- os: macos
cpu: arm64
- os: windows - os: windows
cpu: amd64 cpu: amd64
branch: [version-1-6, version-2-0, devel] branch: [version-1-6, version-2-0, devel]
include: include:
- target: - target:
os: linux os: linux
builder: ubuntu-20.04 builder: ubuntu-latest
shell: bash shell: bash
- target: - target:
os: macos os: macos
builder: macos-12 cpu: amd64
builder: macos-13
shell: bash
- target:
os: macos
cpu: arm64
builder: macos-latest
shell: bash shell: bash
- target: - target:
os: windows os: windows
@ -118,6 +126,8 @@ jobs:
run: | run: |
if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
PLATFORM=x64 PLATFORM=x64
elif [[ '${{ matrix.target.cpu }}' == 'arm64' ]]; then
PLATFORM=arm64
else else
PLATFORM=x86 PLATFORM=x86
fi fi

View File

@ -26,9 +26,9 @@ proc build(args, path: string) =
exec nimc & " " & lang & " " & cfg & " " & flags & " " & args & " " & path exec nimc & " " & lang & " " & cfg & " " & flags & " " & args & " " & path
proc run(args, path: string) = proc run(args, path: string) =
build args & " -r", path build args & " --mm:refc -r", path
if (NimMajor, NimMinor) > (1, 6): if (NimMajor, NimMinor) > (1, 6):
build args & " --mm:refc -r", path build args & " --mm:orc -r", path
task test, "Run all tests": task test, "Run all tests":
for threads in ["--threads:off", "--threads:on"]: for threads in ["--threads:off", "--threads:on"]: