Skip to content

Commit c49fb5a

Browse files
authored
replace outdated macos-13 runner (#25155)
1 parent a77d1cc commit c49fb5a

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

.github/workflows/ci_packages.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
os: [ubuntu-22.04, macos-13]
22-
cpu: [amd64]
21+
os: [ubuntu-latest, macos-14]
2322
batch: ["allowed_failures", "0_3", "1_3", "2_3"] # list of `index_num`
23+
include:
24+
- os: ubuntu-latest
25+
cpu: amd64
26+
- os: macos-14
27+
cpu: arm64
2428
name: '${{ matrix.os }} (batch: ${{ matrix.batch }})'
2529
runs-on: ${{ matrix.os }}
2630
timeout-minutes: 60 # refs bug #18178
@@ -41,11 +45,11 @@ jobs:
4145
- name: 'Install dependencies (Linux amd64)'
4246
if: runner.os == 'Linux' && matrix.cpu == 'amd64'
4347
run: |
44-
sudo apt-fast update -qq
48+
sudo apt-get update -qq
4549
DEBIAN_FRONTEND='noninteractive' \
46-
sudo apt-fast install --no-install-recommends -yq \
50+
sudo apt-get install --no-install-recommends -yq \
4751
libcurl4-openssl-dev libgc-dev libsdl1.2-dev libsfml-dev \
48-
valgrind libc6-dbg libblas-dev xorg-dev
52+
valgrind libc6-dbg libblas-dev liblapack-dev libpcre3 xorg-dev
4953
- name: 'Install dependencies (macOS)'
5054
if: runner.os == 'macOS'
5155
run: brew install boehmgc make sfml gtk+3

testament/important_packages.nim

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ pkg "argparse"
3838
pkg "arraymancer", "nimble install -y; nimble uninstall -i -y nimcuda; nimble install nimcuda@0.2.1; nim c tests/tests_cpu.nim"
3939
pkg "ast_pattern_matching", "nim c -r tests/test1.nim"
4040
pkg "asyncftpclient", "nimble compileExample"
41-
pkg "asyncthreadpool", "nimble test --mm:refc"
41+
when not defined(arm64):
42+
pkg "asyncthreadpool", "nimble test --mm:refc"
4243
pkg "awk"
4344
pkg "bigints"
4445
pkg "binaryheap", "nim c -r binaryheap.nim"
@@ -59,7 +60,8 @@ pkg "comprehension", "nimble test", "https://github.com/alehander92/comprehensio
5960
pkg "confutils", "nimble install -y toml_serialization json_serialization unittest2; nimble test"
6061
pkg "constantine", "nimble make_lib"
6162
pkg "cowstrings", "nim c -r tests/tcowstrings.nim"
62-
pkg "criterion"
63+
when not defined(arm64):
64+
pkg "criterion"
6365
pkg "dashing", "nim c tests/functional.nim"
6466
pkg "datamancer"
6567
pkg "delaunay"
@@ -121,7 +123,8 @@ pkg "nimpy", "nim c -r tests/nimfrompy.nim"
121123
pkg "nimquery"
122124
pkg "nimsl"
123125
pkg "nimsvg"
124-
pkg "nimterop", "nimble minitest", url = "https://github.com/nim-lang/nimterop"
126+
when not defined(arm64):
127+
pkg "nimterop", "nimble minitest", url = "https://github.com/nim-lang/nimterop"
125128
pkg "nimwc", "nim c nimwc.nim"
126129
pkg "nitter", "nim c src/nitter.nim", "https://github.com/zedeus/nitter"
127130
pkg "noise"
@@ -133,7 +136,8 @@ pkg "optionsutils"
133136
pkg "ormin", "nim c -o:orminn ormin.nim"
134137
pkg "parsetoml"
135138
pkg "patty"
136-
pkg "pixie"
139+
when not defined(arm64):
140+
pkg "pixie"
137141
pkg "plotly", "nim c examples/all.nim"
138142
pkg "pnm"
139143
pkg "polypbren"
@@ -177,7 +181,8 @@ pkg "unicodeplus", "nim c -d:release -r tests/tests.nim"
177181
pkg "union", "nim c -r tests/treadme.nim", url = "https://github.com/alaviss/union"
178182
pkg "unittest2"
179183
pkg "unpack"
180-
pkg "weave", "nimble install -y cligen@#HEAD; nimble test_gc_arc", useHead = true
184+
when not defined(arm64):
185+
pkg "weave", "nimble install -y cligen@#HEAD; nimble test_gc_arc", useHead = true
181186
pkg "websock", "nim c -d:chronosStrictException -d:chronicles_log_level=INFO --mm:refc tests/all_tests.nim"
182187
pkg "websocket", "nim c websocket.nim"
183188
pkg "with"

0 commit comments

Comments
 (0)