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

This commit is contained in:
Miran 2024-07-03 12:57:58 +02:00 committed by GitHub
parent 4ad38079de
commit 13d28a5b71
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 23 additions and 15 deletions

View File

@ -22,23 +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
#- os: windows
#cpu: i386
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:
@ -50,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
- name: Enable debug verbosity - name: Enable debug verbosity
if: runner.debug == '1' if: runner.debug == '1'
@ -102,7 +108,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@v3 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 }}'
@ -126,6 +132,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

@ -15,7 +15,7 @@ jobs:
continue-on-error: true continue-on-error: true
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
submodules: true submodules: true
- uses: actions-rs/install@v0.1 - uses: actions-rs/install@v0.1
@ -41,7 +41,7 @@ jobs:
- uses: jiro4989/setup-nim-action@v1 - uses: jiro4989/setup-nim-action@v1
with: with:
nim-version: '1.6.16' nim-version: '1.6.20'
- name: Generate doc - name: Generate doc
run: | run: |

View File

@ -55,10 +55,10 @@ task examples, "Build examples":
task test, "Run all tests": task test, "Run all tests":
for args in testArguments: for args in testArguments:
# First run tests with `refc` memory manager.
run args & " --mm:refc", "tests/testall"
if (NimMajor, NimMinor) > (1, 6): if (NimMajor, NimMinor) > (1, 6):
# First run tests with `refc` memory manager. run args & " --mm:orc", "tests/testall"
run args & " --mm:refc", "tests/testall"
run args, "tests/testall"
task test_v3_compat, "Run all tests in v3 compatibility mode": task test_v3_compat, "Run all tests in v3 compatibility mode":
for args in testArguments: for args in testArguments:
@ -75,10 +75,10 @@ task test_libbacktrace, "test with libbacktrace":
] ]
for args in allArgs: for args in allArgs:
# First run tests with `refc` memory manager.
run args & " --mm:refc", "tests/testall"
if (NimMajor, NimMinor) > (1, 6): if (NimMajor, NimMinor) > (1, 6):
# First run tests with `refc` memory manager. run args & " --mm:orc", "tests/testall"
run args & " --mm:refc", "tests/testall"
run args, "tests/testall"
task docs, "Generate API documentation": task docs, "Generate API documentation":
exec "mdbook build docs" exec "mdbook build docs"