Skip to content

Commit

Permalink
Merge pull request zeromq#599 from zeromq/gummif-patch-2
Browse files Browse the repository at this point in the history
Upgrade deprecated CI OS
  • Loading branch information
gummif authored Sep 14, 2023
2 parents 85a14af + 47c1278 commit 160ac8e
Showing 1 changed file with 11 additions and 29 deletions.
40 changes: 11 additions & 29 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,50 +11,32 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ["ubuntu-latest"]
os: ["ubuntu-20.04"]
cppstd: ["98", "11", "20"]
cc: ["gcc-10"]
cxx: ["g++-10"]
drafts: ["ON"]
libzmq: ["4.3.4"]
libzmqbuild: ["cmake"]
include:
# older libzmq and gcc without draft
- os: "ubuntu-18.04"
# older libzmq and without draft
- os: "ubuntu-20.04"
cppstd: "11"
cc: "gcc-7"
cxx: "g++-7"
cc: "gcc-9"
cxx: "g++-9"
drafts: "OFF"
libzmq: "4.2.0"
libzmqbuild: "pkgconfig"
# gcc 4.8
- os: "ubuntu-18.04"
cppstd: "11"
cc: "gcc-4.8"
cxx: "g++-4.8"
drafts: "ON"
libzmq: "4.3.4"
libzmqbuild: "cmake"
aptinstall: "gcc-4.8 g++-4.8"
# gcc 5
- os: "ubuntu-18.04"
cppstd: "11"
cc: "gcc-5"
cxx: "g++-5"
drafts: "ON"
libzmq: "4.3.4"
libzmqbuild: "cmake"
aptinstall: "gcc-5 g++-5"
# without draft
- os: "ubuntu-latest"
- os: "ubuntu-22.04"
cppstd: "20"
cc: "gcc-10"
cxx: "g++-10"
cc: "gcc-11"
cxx: "g++-11"
drafts: "OFF"
libzmq: "4.3.4"
libzmqbuild: "cmake"
# coverage (gcc version should match gcov version)
- os: "ubuntu-latest"
- os: "ubuntu-20.04"
cppstd: "17"
cc: "gcc-9"
cxx: "g++-9"
Expand All @@ -64,7 +46,7 @@ jobs:
coverage: "-DCOVERAGE=ON"
aptinstall: "lcov"
# clang
- os: "ubuntu-latest"
- os: "ubuntu-20.04"
cppstd: "17"
cc: "clang-12"
cxx: "clang++-12"
Expand All @@ -89,7 +71,7 @@ jobs:
libzmq: "4.3.4"
libzmqbuild: "cmake"
platform: "-Ax64"
- os: "windows-latest"
- os: "windows-2022"
cppstd: "20"
cc: "msbuild"
cxx: "msbuild"
Expand Down

0 comments on commit 160ac8e

Please # to comment.