Skip to content

Commit 96d58fe

Browse files
authored
Update macOS workflow (#870)
1 parent 58785f9 commit 96d58fe

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

.github/workflows/tests-macos.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ jobs:
6262
kokkos_extra_cmake_flags: ''
6363
cxx_version: ['17', '20', '23']
6464
cmake_build_type: ['Debug', 'Release']
65-
exclude:
66-
- cxx_version: '20' # To be removed as soon as PDI supports C++20 with clang
67-
- cxx_version: '23' # To be removed as soon as PDI supports C++20 with clang
6865
runs-on: macos-latest
6966
needs: [id_repo]
7067
env:
@@ -88,13 +85,10 @@ jobs:
8885
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8986
with:
9087
repository: pdidev/pdi
91-
ref: 1.8.3
88+
ref: 1.9.2
9289
path: pdi
9390
- name: Install PDI+user code plugin and dependencies
9491
run: |
95-
# PATCH: remove <link.h> for macOS
96-
sed -i.bak 's|#include <link.h>||g' pdi/plugins/user_code/user_code.cxx
97-
rm -f pdi/plugins/user_code/user_code.cxx.bak
9892
cmake \
9993
-D BUILD_BENCHMARKING=OFF \
10094
-D BUILD_DECL_HDF5_PLUGIN=OFF \
@@ -110,7 +104,7 @@ jobs:
110104
-D BUILD_TRACE_PLUGIN=OFF \
111105
-D BUILD_USER_CODE_PLUGIN=ON \
112106
-D CMAKE_CXX_FLAGS="-Wno-unqualified-std-cast-call" \
113-
-D CMAKE_CXX_STANDARD=${{matrix.cxx_version}} \
107+
-D CMAKE_CXX_STANDARD=17 \
114108
-B build \
115109
-S ./pdi
116110
cmake --build build

0 commit comments

Comments
 (0)