Skip to content

Commit 7cb78a8

Browse files
authored
Update CI runners (#658)
1 parent 78f91ad commit 7cb78a8

File tree

1 file changed

+25
-19
lines changed

1 file changed

+25
-19
lines changed

.github/workflows/ci.yml

+25-19
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
os: ["ubuntu-20.04"]
14+
os: ["ubuntu-22.04"]
1515
cppstd: ["98", "11", "20"]
1616
cc: ["gcc-10"]
1717
cxx: ["g++-10"]
@@ -20,23 +20,23 @@ jobs:
2020
libzmqbuild: ["cmake"]
2121
include:
2222
# older libzmq and without draft
23-
- os: "ubuntu-20.04"
23+
- os: "ubuntu-22.04"
2424
cppstd: "11"
2525
cc: "gcc-9"
2626
cxx: "g++-9"
2727
drafts: "OFF"
2828
libzmq: "4.2.0"
2929
libzmqbuild: "pkgconfig"
3030
# without draft
31-
- os: "ubuntu-22.04"
32-
cppstd: "20"
33-
cc: "gcc-11"
34-
cxx: "g++-11"
31+
- os: "ubuntu-24.04"
32+
cppstd: "23"
33+
cc: "gcc-13"
34+
cxx: "g++-13"
3535
drafts: "OFF"
3636
libzmq: "4.3.5"
3737
libzmqbuild: "cmake"
3838
# coverage (gcc version should match gcov version)
39-
- os: "ubuntu-20.04"
39+
- os: "ubuntu-22.04"
4040
cppstd: "17"
4141
cc: "gcc-9"
4242
cxx: "g++-9"
@@ -46,10 +46,10 @@ jobs:
4646
coverage: "-DCOVERAGE=ON"
4747
aptinstall: "lcov"
4848
# clang
49-
- os: "ubuntu-20.04"
49+
- os: "ubuntu-22.04"
5050
cppstd: "17"
51-
cc: "clang-12"
52-
cxx: "clang++-12"
51+
cc: "clang-14"
52+
cxx: "clang++-14"
5353
drafts: "ON"
5454
libzmq: "4.3.5"
5555
libzmqbuild: "cmake"
@@ -63,14 +63,14 @@ jobs:
6363
libzmqbuild: false
6464
brewinstall: "zeromq"
6565
# windows
66-
- os: "windows-2019"
67-
cppstd: "14"
68-
cc: "msbuild"
69-
cxx: "msbuild"
70-
drafts: "ON"
71-
libzmq: "4.3.5"
72-
libzmqbuild: "cmake"
73-
platform: "-Ax64"
66+
#- os: "windows-2019"
67+
# cppstd: "14"
68+
# cc: "msbuild"
69+
# cxx: "msbuild"
70+
# drafts: "ON"
71+
# libzmq: "4.3.5"
72+
# libzmqbuild: "cmake"
73+
# platform: "-Ax64"
7474
- os: "windows-2022"
7575
cppstd: "20"
7676
cc: "msbuild"
@@ -116,6 +116,12 @@ jobs:
116116
cmake --build libzmq-build --config ${BUILDTYPE} -j ${THREADS}
117117
echo "LIBZMQ=${PWD}/libzmq-build" >> ${GITHUB_ENV}
118118
119+
- name: post_build_libzmq_cmake
120+
if: ${{ matrix.libzmqbuild == 'cmake' && startsWith(matrix.os, 'windows') }}
121+
run: |
122+
mkdir -p build/tests/${BUILDTYPE}
123+
cp ${{ env.LIBZMQ }}/bin/${BUILDTYPE}/*.dll build/tests/${BUILDTYPE}
124+
119125
- name: build_libzmq_pkgconfig
120126
if: ${{ matrix.libzmqbuild == 'pkgconfig' }}
121127
working-directory: libzmq-${{ matrix.libzmq }}
@@ -145,7 +151,7 @@ jobs:
145151
146152
- name: demo
147153
# probably need to install libzmq and cppzmq for this to work on windows
148-
if: ${{ matrix.os == 'ubuntu*' }}
154+
if: ${{ matrix.os == 'ubuntu-24.04' }}
149155
env:
150156
CMAKE_PREFIX_PATH: ${{ env.LIBZMQ }}:${{ env.CPPZMQ }}
151157
run: |

0 commit comments

Comments
 (0)