Skip to content

Commit 15edc6d

Browse files
authored
Merge branch 'cpputest:master' into ub-ub-doo
2 parents c210b20 + 7a3b3e0 commit 15edc6d

File tree

2 files changed

+1
-32
lines changed

2 files changed

+1
-32
lines changed

.github/workflows/basic.yml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -63,27 +63,6 @@ jobs:
6363
cc: clang
6464
cxx: clang++
6565
make_args: tdd
66-
- name: GTest 1.5
67-
os: ubuntu-20.04
68-
make_args: check_gtest15
69-
- name: GTest 1.6
70-
os: ubuntu-20.04
71-
make_args: check_gtest16
72-
- name: GTest 1.7
73-
os: ubuntu-20.04
74-
make_args: check_gtest17
75-
- name: GTest 1.8
76-
os: ubuntu-20.04
77-
make_args: check_gtest18
78-
- name: GTest 1.10
79-
os: ubuntu-20.04
80-
make_args: check_gtest110
81-
- name: GTest 1.11
82-
os: ubuntu-20.04
83-
make_args: check_gtest111
84-
- name: GTest 1.12
85-
os: ubuntu-20.04
86-
make_args: check_gtest112
8766
- name: Disable long long
8867
os: ubuntu-latest
8968
configure_args: --disable-longlong
@@ -97,11 +76,6 @@ jobs:
9776
runs-on: ${{ matrix.os }}
9877
name: Autotools ${{ matrix.name }}
9978
steps:
100-
- name: Install Python 2
101-
uses: actions/setup-python@v4
102-
with:
103-
python-version: "2.7"
104-
if: ${{ startswith(matrix.name, 'GTest') }}
10579
- name: Checkout
10680
uses: actions/checkout@main
10781
- run: brew install automake
@@ -220,12 +194,6 @@ jobs:
220194
os: ubuntu-latest
221195
preset: coverage
222196
apt_packages: lcov
223-
- name: Google Test
224-
os: ubuntu-20.04
225-
cmake_args: -DCMAKE_CXX_STANDARD=98
226-
preset: gtest
227-
ctest_args: -C Debug
228-
apt_packages: python2 ninja-build
229197
- name: Address Sanitizer
230198
os: ubuntu-latest
231199
preset: asan

cmake/warnings.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ if(
2121
-Wno-reserved-id-macro
2222
-Wno-keyword-macro
2323
-Wno-long-long
24+
-Wno-unsafe-buffer-usage
2425
)
2526

2627
set(WARNING_C_FLAGS

0 commit comments

Comments
 (0)