Skip to content

Commit 13d28a5

Browse files
authored
update ci.yml and be more explicit in .nimble (#549)
1 parent 4ad3807 commit 13d28a5

File tree

3 files changed

+23
-15
lines changed

3 files changed

+23
-15
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,29 @@ jobs:
2222
cpu: i386
2323
- os: macos
2424
cpu: amd64
25+
- os: macos
26+
cpu: arm64
2527
- os: windows
2628
cpu: amd64
27-
#- os: windows
28-
#cpu: i386
2929
branch: [version-1-6, version-2-0, devel]
3030
include:
3131
- target:
3232
os: linux
33-
builder: ubuntu-20.04
33+
builder: ubuntu-latest
34+
shell: bash
35+
- target:
36+
os: macos
37+
cpu: amd64
38+
builder: macos-13
3439
shell: bash
3540
- target:
3641
os: macos
37-
builder: macos-12
42+
cpu: arm64
43+
builder: macos-latest
3844
shell: bash
3945
- target:
4046
os: windows
41-
builder: windows-2019
47+
builder: windows-latest
4248
shell: msys2 {0}
4349

4450
defaults:
@@ -50,7 +56,7 @@ jobs:
5056
continue-on-error: ${{ matrix.branch == 'devel' }}
5157
steps:
5258
- name: Checkout
53-
uses: actions/checkout@v3
59+
uses: actions/checkout@v4
5460

5561
- name: Enable debug verbosity
5662
if: runner.debug == '1'
@@ -102,7 +108,7 @@ jobs:
102108
- name: Restore Nim DLLs dependencies (Windows) from cache
103109
if: runner.os == 'Windows'
104110
id: windows-dlls-cache
105-
uses: actions/cache@v3
111+
uses: actions/cache@v4
106112
with:
107113
path: external/dlls-${{ matrix.target.cpu }}
108114
key: 'dlls-${{ matrix.target.cpu }}'
@@ -126,6 +132,8 @@ jobs:
126132
run: |
127133
if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
128134
PLATFORM=x64
135+
elif [[ '${{ matrix.target.cpu }}' == 'arm64' ]]; then
136+
PLATFORM=arm64
129137
else
130138
PLATFORM=x86
131139
fi

.github/workflows/doc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
continue-on-error: true
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
with:
2020
submodules: true
2121
- uses: actions-rs/install@v0.1
@@ -41,7 +41,7 @@ jobs:
4141

4242
- uses: jiro4989/setup-nim-action@v1
4343
with:
44-
nim-version: '1.6.16'
44+
nim-version: '1.6.20'
4545

4646
- name: Generate doc
4747
run: |

chronos.nimble

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ task examples, "Build examples":
5555

5656
task test, "Run all tests":
5757
for args in testArguments:
58+
# First run tests with `refc` memory manager.
59+
run args & " --mm:refc", "tests/testall"
5860
if (NimMajor, NimMinor) > (1, 6):
59-
# First run tests with `refc` memory manager.
60-
run args & " --mm:refc", "tests/testall"
61-
run args, "tests/testall"
61+
run args & " --mm:orc", "tests/testall"
6262

6363
task test_v3_compat, "Run all tests in v3 compatibility mode":
6464
for args in testArguments:
@@ -75,10 +75,10 @@ task test_libbacktrace, "test with libbacktrace":
7575
]
7676

7777
for args in allArgs:
78+
# First run tests with `refc` memory manager.
79+
run args & " --mm:refc", "tests/testall"
7880
if (NimMajor, NimMinor) > (1, 6):
79-
# First run tests with `refc` memory manager.
80-
run args & " --mm:refc", "tests/testall"
81-
run args, "tests/testall"
81+
run args & " --mm:orc", "tests/testall"
8282

8383
task docs, "Generate API documentation":
8484
exec "mdbook build docs"

0 commit comments

Comments
 (0)