Skip to content

Commit 62f6c5c

Browse files
authored
Merge pull request #504 from gummif/gfa/actions-old-gcc
CI for older gcc versions
2 parents 142c9d6 + 11bbef7 commit 62f6c5c

File tree

3 files changed

+25
-2
lines changed

3 files changed

+25
-2
lines changed

.github/workflows/linux.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,24 @@ jobs:
2323
drafts: "OFF"
2424
libzmq: "4.2.0"
2525
libzmqbuild: "pkgconfig"
26+
# gcc 4.8
27+
- os: "ubuntu-18.04"
28+
cppstd: "11"
29+
cc: "gcc-4.8"
30+
cxx: "g++-4.8"
31+
drafts: "ON"
32+
libzmq: "4.3.4"
33+
libzmqbuild: "cmake"
34+
aptinstall: "gcc-4.8 g++-4.8"
35+
# gcc 5
36+
- os: "ubuntu-18.04"
37+
cppstd: "11"
38+
cc: "gcc-5"
39+
cxx: "g++-5"
40+
drafts: "ON"
41+
libzmq: "4.3.4"
42+
libzmqbuild: "cmake"
43+
aptinstall: "gcc-5 g++-5"
2644
# without draft
2745
- os: "ubuntu-latest"
2846
cppstd: "20"
@@ -51,6 +69,11 @@ jobs:
5169

5270
steps:
5371
- uses: actions/checkout@v2
72+
73+
- name: install_deps
74+
if: matrix.aptinstall
75+
run: sudo apt install ${{matrix.aptinstall}}
76+
5477
- name: get_libzmq
5578
run: |
5679
curl -L https://github.com/zeromq/libzmq/archive/v${{ matrix.libzmq }}.tar.gz \

tests/active_poller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "testutil.hpp"
44

5-
#if defined(ZMQ_CPP11) && defined(ZMQ_BUILD_DRAFT_API)
5+
#if defined(ZMQ_CPP11) && !defined(ZMQ_CPP11_PARTIAL) && defined(ZMQ_BUILD_DRAFT_API)
66

77
#include <array>
88
#include <memory>

tests/poller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "testutil.hpp"
22

3-
#if defined(ZMQ_BUILD_DRAFT_API) && defined(ZMQ_CPP11) && defined(ZMQ_HAVE_POLLER)
3+
#if defined(ZMQ_BUILD_DRAFT_API) && defined(ZMQ_CPP11) && !defined(ZMQ_CPP11_PARTIAL) && defined(ZMQ_HAVE_POLLER)
44

55
#include <array>
66
#include <memory>

0 commit comments

Comments
 (0)