update ci.yml and be more explicit in .nimble (#221)
This commit is contained in:
parent
f40a8ba5c8
commit
8e1cdb1823
|
@ -22,23 +22,29 @@ jobs:
|
|||
cpu: i386
|
||||
- os: macos
|
||||
cpu: amd64
|
||||
- os: macos
|
||||
cpu: arm64
|
||||
- os: windows
|
||||
cpu: amd64
|
||||
#- os: windows
|
||||
#cpu: i386
|
||||
branch: [version-1-6, version-2-0, devel]
|
||||
include:
|
||||
- target:
|
||||
os: linux
|
||||
builder: ubuntu-20.04
|
||||
builder: ubuntu-latest
|
||||
shell: bash
|
||||
- target:
|
||||
os: macos
|
||||
builder: macos-12
|
||||
cpu: amd64
|
||||
builder: macos-13
|
||||
shell: bash
|
||||
- target:
|
||||
os: macos
|
||||
cpu: arm64
|
||||
builder: macos-latest
|
||||
shell: bash
|
||||
- target:
|
||||
os: windows
|
||||
builder: windows-2019
|
||||
builder: windows-latest
|
||||
shell: msys2 {0}
|
||||
|
||||
defaults:
|
||||
|
@ -120,6 +126,8 @@ jobs:
|
|||
run: |
|
||||
if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
|
||||
PLATFORM=x64
|
||||
elif [[ '${{ matrix.target.cpu }}' == 'arm64' ]]; then
|
||||
PLATFORM=arm64
|
||||
else
|
||||
PLATFORM=x86
|
||||
fi
|
||||
|
|
|
@ -43,14 +43,14 @@ proc build(args, path: string) =
|
|||
exec nimc & " " & lang & " " & cfg & " " & flags & " " & args & " " & path
|
||||
|
||||
proc run(args, path: string) =
|
||||
build args & " -r", path
|
||||
build args & " --mm:refc -r", path
|
||||
if (NimMajor, NimMinor) > (1, 6):
|
||||
build args & " --mm:refc -r", path
|
||||
build args & " --mm:orc -r", path
|
||||
|
||||
proc buildOnly(args, path: string) =
|
||||
build args, path
|
||||
build args & " --mm:refc", path
|
||||
if (NimMajor, NimMinor) > (1, 6):
|
||||
build args & " --mm:refc -r", path
|
||||
build args & " --mm:orc", path
|
||||
|
||||
task test, "run tests":
|
||||
run "", "tests/all"
|
||||
|
|
Loading…
Reference in New Issue