Skip to content

Commit 38ccd20

Browse files
authored
Merge branch 'devel' into araq-nimsuggest-tester
2 parents d460215 + d5549a3 commit 38ccd20

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

.github/workflows/ci_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- target: windows
4646
os: windows-latest
4747
- target: osx
48-
os: macos-13
48+
os: macos-15
4949

5050
name: ${{ matrix.target }}
5151
runs-on: ${{ matrix.os }}

azure-pipelines.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ jobs:
2828
# # g++-multilib : Depends: gcc-multilib (>= 4:5.3.1-1ubuntu1) but it is not going to be installed
2929
# vmImage: 'ubuntu-18.04'
3030
# CPU: i386
31-
OSX_amd64:
32-
vmImage: 'macOS-13'
33-
CPU: amd64
34-
OSX_amd64_cpp:
35-
vmImage: 'macOS-13'
36-
CPU: amd64
31+
OSX_arm64:
32+
vmImage: 'macos-15'
33+
CPU: arm64
34+
OSX_arm64_cpp:
35+
vmImage: 'macos-15'
36+
CPU: arm64
3737
NIM_COMPILE_TO_CPP: true
3838
Windows_amd64_batch0_3:
3939
vmImage: 'windows-2025'

tests/compiler/tasm.nim

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
discard """
2+
disabled: "osx"
3+
"""
4+
15
proc testAsm() =
26
let src = 41
37
var dst = 0

tests/stdlib/tarithmetics.nim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
discard """
22
matrix: "--mm:refc; --mm:orc"
33
targets: "c cpp js"
4+
disabled: "osx"
45
"""
56
import std/assertions
67
# TODO: in future work move existing arithmetic tests (tests/arithm/*) into this file

tests/stdlib/thttpclient.nim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ discard """
33
disabled: "openbsd"
44
disabled: "freebsd"
55
disabled: "windows"
6+
disabled: "osx"
67
"""
78

89
#[

0 commit comments

Comments
 (0)