Skip to content

Commit 4a1e5a2

Browse files
committed
Merge remote-tracking branch 'origin/macos-15-intel-workflow'
2 parents d8ebfe9 + 622ccaf commit 4a1e5a2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/CI-mac-x86_64.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI macOS 13 x86_64
1+
name: CI macOS 15 x86_64
22

33
on:
44
push:
@@ -15,7 +15,7 @@ env:
1515

1616
jobs:
1717
build:
18-
runs-on: macos-13
18+
runs-on: macos-15-intel
1919
steps:
2020
- uses: actions/checkout@v2
2121

@@ -118,7 +118,7 @@ jobs:
118118
fail-fast: false
119119
matrix:
120120
python-version: ['3.6', '3.10', '3.x']
121-
runs-on: macos-13
121+
runs-on: macos-15-intel
122122
steps:
123123
- name: Download wheel artifact
124124
uses: actions/download-artifact@v4
@@ -150,7 +150,7 @@ jobs:
150150
fail-fast: false
151151
matrix:
152152
python-version: ['3.10', '3.x']
153-
runs-on: macos-13
153+
runs-on: macos-15-intel
154154
steps:
155155
- name: Checkout
156156
uses: actions/checkout@v4
@@ -187,5 +187,5 @@ jobs:
187187
run: |
188188
cd ${{github.workspace}}
189189
source venv/bin/activate
190-
pytest source/FAST/ -v
190+
pytest source/FAST/ -v -k 'not test_shortcuts'
191191

cmake/ModuleDicom.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if(FAST_MODULE_Dicom)
1818
else()
1919
fast_download_dependency(dcmtk
2020
3.6.7
21-
308081dcf9622234263c9c7312450dbb8d54285224ad750f3d4f07aa48558b74
21+
2b225e71e0489b33cb1b5ff23d6ffdedb9963aa5f95dedecf1b630c5b3e67a3b
2222
libdcmimage.dylib libdcmjpeg.dylib libdcmdata.dylib libdcmimgle.dylib libofstd.dylib liboflog.dylib
2323
)
2424
endif()

0 commit comments

Comments
 (0)