update ci.yml and be more explicit in .nimble (#30)
* update ci.yml and be more explicit in .nimble * import results: get rid of the deprecated warning
This commit is contained in:
parent
913c426d57
commit
2de3844c6e
|
@ -22,21 +22,29 @@ 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
|
||||||
builder: windows-2019
|
builder: windows-latest
|
||||||
shell: msys2 {0}
|
shell: msys2 {0}
|
||||||
|
|
||||||
defaults:
|
defaults:
|
||||||
|
@ -48,7 +56,7 @@ jobs:
|
||||||
continue-on-error: ${{ matrix.branch == 'devel' }}
|
continue-on-error: ${{ matrix.branch == 'devel' }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
|
@ -96,7 +104,7 @@ jobs:
|
||||||
- name: Restore Nim DLLs dependencies (Windows) from cache
|
- name: Restore Nim DLLs dependencies (Windows) from cache
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
id: windows-dlls-cache
|
id: windows-dlls-cache
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: external/dlls-${{ matrix.target.cpu }}
|
path: external/dlls-${{ matrix.target.cpu }}
|
||||||
key: 'dlls-${{ matrix.target.cpu }}'
|
key: 'dlls-${{ matrix.target.cpu }}'
|
||||||
|
@ -120,6 +128,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
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
{.push raises: [].}
|
{.push raises: [].}
|
||||||
|
|
||||||
import
|
import
|
||||||
stew/[arrayops, endians2, leb128, results],
|
stew/[arrayops, endians2, leb128],
|
||||||
|
results,
|
||||||
./snappy/[codec, decoder, encoder]
|
./snappy/[codec, decoder, encoder]
|
||||||
|
|
||||||
export codec, results
|
export codec, results
|
||||||
|
|
|
@ -10,6 +10,7 @@ skipDirs = @["tests"]
|
||||||
requires "nim >= 1.6.0",
|
requires "nim >= 1.6.0",
|
||||||
"faststreams",
|
"faststreams",
|
||||||
"unittest2",
|
"unittest2",
|
||||||
|
"results",
|
||||||
"stew"
|
"stew"
|
||||||
|
|
||||||
let nimc = getEnv("NIMC", "nim") # Which nim compiler to use
|
let nimc = getEnv("NIMC", "nim") # Which nim compiler to use
|
||||||
|
@ -31,9 +32,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
|
||||||
|
|
||||||
### Helper functions
|
### Helper functions
|
||||||
proc test(args, path: string) =
|
proc test(args, path: string) =
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
{.push raises: [].}
|
{.push raises: [].}
|
||||||
|
|
||||||
import
|
import
|
||||||
stew/[endians2, leb128, results]
|
results,
|
||||||
|
stew/[endians2, leb128]
|
||||||
|
|
||||||
export endians2, leb128, results
|
export endians2, leb128, results
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue