From 19dc02e1bb5377a0c5e0180a435baf3e9021f00e Mon Sep 17 00:00:00 2001 From: ringabout <43030857+ringabout@users.noreply.github.com> Date: Wed, 12 Nov 2025 20:33:26 +0800 Subject: [PATCH] updates to macos-15 (#25278) ref https://github.com/actions/runner-images/issues/13046 (cherry picked from commit d5549a3c65875b30888d3d68ca8145cd3ecbd3ed) --- .github/workflows/ci_docs.yml | 2 +- azure-pipelines.yml | 12 ++++++------ tests/compiler/tasm.nim | 4 ++++ tests/stdlib/tarithmetics.nim | 1 + tests/stdlib/thttpclient.nim | 1 + 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml index 066d9dbdc3..770c3faccd 100644 --- a/.github/workflows/ci_docs.yml +++ b/.github/workflows/ci_docs.yml @@ -47,7 +47,7 @@ jobs: - target: windows os: windows-2019 - target: osx - os: macos-13 + os: macos-15 name: ${{ matrix.target }} runs-on: ${{ matrix.os }} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 628d91527f..78b46237b7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,12 +28,12 @@ jobs: # # g++-multilib : Depends: gcc-multilib (>= 4:5.3.1-1ubuntu1) but it is not going to be installed # vmImage: 'ubuntu-18.04' # CPU: i386 - OSX_amd64: - vmImage: 'macOS-13' - CPU: amd64 - OSX_amd64_cpp: - vmImage: 'macOS-13' - CPU: amd64 + OSX_arm64: + vmImage: 'macos-15' + CPU: arm64 + OSX_arm64_cpp: + vmImage: 'macos-15' + CPU: arm64 NIM_COMPILE_TO_CPP: true Windows_amd64_batch0_3: vmImage: 'windows-2025' diff --git a/tests/compiler/tasm.nim b/tests/compiler/tasm.nim index 9f60231e0b..a6b68d6211 100644 --- a/tests/compiler/tasm.nim +++ b/tests/compiler/tasm.nim @@ -1,3 +1,7 @@ +discard """ + disabled: "osx" +""" + proc testAsm() = let src = 41 var dst = 0 diff --git a/tests/stdlib/tarithmetics.nim b/tests/stdlib/tarithmetics.nim index 0a6dd1fcfd..5b0cb93f3a 100644 --- a/tests/stdlib/tarithmetics.nim +++ b/tests/stdlib/tarithmetics.nim @@ -1,6 +1,7 @@ discard """ matrix: "--mm:refc; --mm:orc" targets: "c cpp js" + disabled: "osx" """ import std/assertions # TODO: in future work move existing arithmetic tests (tests/arithm/*) into this file diff --git a/tests/stdlib/thttpclient.nim b/tests/stdlib/thttpclient.nim index 0bd4796704..c7c25d330f 100644 --- a/tests/stdlib/thttpclient.nim +++ b/tests/stdlib/thttpclient.nim @@ -3,6 +3,7 @@ discard """ disabled: "openbsd" disabled: "freebsd" disabled: "windows" + disabled: "osx" """ #[