From b5dd9735f44005b10db9907325facb7e980d5cb7 Mon Sep 17 00:00:00 2001 From: Miran Date: Mon, 15 Sep 2025 15:03:59 +0200 Subject: [PATCH] replace outdated macos-13 runner (#25155) (cherry picked from commit c49fb5ac5f6ad6e2e466cd3a774a6dcced26030a) --- .github/workflows/ci_packages.yml | 14 +++++++++----- testament/important_packages.nim | 15 ++++++++++----- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci_packages.yml b/.github/workflows/ci_packages.yml index fec634966b..afd8d0696c 100644 --- a/.github/workflows/ci_packages.yml +++ b/.github/workflows/ci_packages.yml @@ -18,9 +18,13 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04, macos-13] - cpu: [amd64] + os: [ubuntu-latest, macos-14] batch: ["allowed_failures", "0_3", "1_3", "2_3"] # list of `index_num` + include: + - os: ubuntu-latest + cpu: amd64 + - os: macos-14 + cpu: arm64 name: '${{ matrix.os }} (batch: ${{ matrix.batch }})' runs-on: ${{ matrix.os }} timeout-minutes: 60 # refs bug #18178 @@ -41,11 +45,11 @@ jobs: - name: 'Install dependencies (Linux amd64)' if: runner.os == 'Linux' && matrix.cpu == 'amd64' run: | - sudo apt-fast update -qq + sudo apt-get update -qq DEBIAN_FRONTEND='noninteractive' \ - sudo apt-fast install --no-install-recommends -yq \ + sudo apt-get install --no-install-recommends -yq \ libcurl4-openssl-dev libgc-dev libsdl1.2-dev libsfml-dev \ - valgrind libc6-dbg libblas-dev xorg-dev + valgrind libc6-dbg libblas-dev liblapack-dev libpcre3 xorg-dev - name: 'Install dependencies (macOS)' if: runner.os == 'macOS' run: brew install boehmgc make sfml gtk+3 diff --git a/testament/important_packages.nim b/testament/important_packages.nim index 2846071a8d..5d8b8d5ef4 100644 --- a/testament/important_packages.nim +++ b/testament/important_packages.nim @@ -38,7 +38,8 @@ pkg "argparse" pkg "arraymancer", "nimble install -y; nimble uninstall -i -y nimcuda; nimble install nimcuda@0.2.1; nim c tests/tests_cpu.nim" pkg "ast_pattern_matching", "nim c -r tests/test1.nim" pkg "asyncftpclient", "nimble compileExample" -pkg "asyncthreadpool", "nimble test --mm:refc" +when not defined(arm64): + pkg "asyncthreadpool", "nimble test --mm:refc" pkg "awk" pkg "bigints" pkg "binaryheap", "nim c -r binaryheap.nim" @@ -59,7 +60,8 @@ pkg "comprehension", "nimble test", "https://github.com/alehander92/comprehensio pkg "confutils", "nimble install -y toml_serialization json_serialization unittest2; nimble test" pkg "constantine", "nimble make_lib" pkg "cowstrings", "nim c -r tests/tcowstrings.nim" -pkg "criterion" +when not defined(arm64): + pkg "criterion" pkg "dashing", "nim c tests/functional.nim" pkg "datamancer" pkg "delaunay" @@ -121,7 +123,8 @@ pkg "nimpy", "nim c -r tests/nimfrompy.nim" pkg "nimquery" pkg "nimsl" pkg "nimsvg" -pkg "nimterop", "nimble minitest", url = "https://github.com/nim-lang/nimterop" +when not defined(arm64): + pkg "nimterop", "nimble minitest", url = "https://github.com/nim-lang/nimterop" pkg "nimwc", "nim c nimwc.nim" pkg "nitter", "nim c src/nitter.nim", "https://github.com/zedeus/nitter" pkg "noise" @@ -133,7 +136,8 @@ pkg "optionsutils" pkg "ormin", "nim c -o:orminn ormin.nim" pkg "parsetoml" pkg "patty" -pkg "pixie" +when not defined(arm64): + pkg "pixie" pkg "plotly", "nim c examples/all.nim" pkg "pnm" pkg "polypbren" @@ -177,7 +181,8 @@ pkg "unicodeplus", "nim c -d:release -r tests/tests.nim" pkg "union", "nim c -r tests/treadme.nim", url = "https://github.com/alaviss/union" pkg "unittest2" pkg "unpack" -pkg "weave", "nimble install -y cligen@#HEAD; nimble test_gc_arc", useHead = true +when not defined(arm64): + pkg "weave", "nimble install -y cligen@#HEAD; nimble test_gc_arc", useHead = true pkg "websock", "nim c -d:chronosStrictException -d:chronicles_log_level=INFO --mm:refc tests/all_tests.nim" pkg "websocket", "nim c websocket.nim" pkg "with"