Skip to content

Commit 36192c5

Browse files
authored
removed unnecessary OSS-Fuzz related builds from CI (#4827)
1 parent af44659 commit 36192c5

6 files changed

Lines changed: 2 additions & 56 deletions

File tree

.github/workflows/CI-unixish.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -280,23 +280,6 @@ jobs:
280280
qmake CONFIG+=debug CONFIG+=ccache
281281
make -j$(nproc)
282282
283-
build_fuzz:
284-
285-
strategy:
286-
matrix:
287-
os: [ubuntu-20.04, ubuntu-22.04] # only needs to build on ubuntu
288-
fail-fast: false # Prefer quick result
289-
290-
runs-on: ${{ matrix.os }}
291-
292-
steps:
293-
- uses: actions/checkout@v3
294-
295-
- name: Build Fuzzer
296-
run: |
297-
pushd oss-fuzz
298-
make -j$(nproc) CXX=clang++ CXXFLAGS="-fsanitize=address" fuzz-client translate
299-
300283
build:
301284

302285
strategy:

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ add_subdirectory(cli) # Client application
9494
add_subdirectory(test) # Tests
9595
add_subdirectory(gui) # Graphical application
9696
add_subdirectory(tools/triage) # Triage tool
97-
add_subdirectory(oss-fuzz) # OSS-Fuzz clients
9897
add_subdirectory(tools)
9998

10099
include(cmake/clang_tidy.cmake)

cmake/options.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ endif()
3838
option(BUILD_TESTS "Build tests" OFF)
3939
option(REGISTER_TESTS "Register tests in CTest" ON)
4040
option(ENABLE_CHECK_INTERNAL "Enable internal checks" OFF)
41-
option(ENABLE_OSS_FUZZ "Enable the OSS-Fuzz related targets" ON)
4241

4342
option(BUILD_GUI "Build the qt application" OFF)
4443
option(WITH_QCHART "Enable QtCharts usage in the GUI" OFF)

cmake/printInfo.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ if(BUILD_TESTS)
4545
message( STATUS "REGISTER_TESTS = ${REGISTER_TESTS}" )
4646
endif()
4747
message( STATUS "ENABLE_CHECK_INTERNAL = ${ENABLE_CHECK_INTERNAL}" )
48-
message( STATUS "ENABLE_OSS_FUZZ = ${ENABLE_OSS_FUZZ}" )
4948
message( STATUS )
5049
message( STATUS "BUILD_GUI = ${BUILD_GUI}" )
5150
if (BUILD_GUI)

oss-fuzz/CMakeLists.txt

Lines changed: 0 additions & 31 deletions
This file was deleted.

oss-fuzz/Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# ====================
44
#
55
# Local libfuzzer client:
6-
# make CXX=clang++-6.0 CXXFLAGS="-fsanitize=address" fuzz-client
6+
# make CXX=clang++-6.0 CXXFLAGS="-fsanitize=address" LIB_FUZZING_ENGINE="-fsanitize=fuzzer" oss-fuzz-client
77

88
CPPCHECK_DIR=..
99
INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/picojson -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals/tinyxml2 -I ${CPPCHECK_DIR}/externals
@@ -14,11 +14,8 @@ all: oss-fuzz-client translate
1414
oss-fuzz-client: main.cpp type2.cpp type2.h
1515
${CXX} -std=c++11 -g ${CXXFLAGS} -o oss-fuzz-client ${INCLUDE_DIR} ${SRC_FILES} ${LIB_FUZZING_ENGINE}
1616

17-
fuzz-client: main.cpp type2.cpp type2.h
18-
${CXX} -std=c++11 -g ${CXXFLAGS} -o fuzz-client ${INCLUDE_DIR} ${SRC_FILES} -fsanitize=fuzzer
19-
2017
translate: translate.cpp type2.cpp type2.h
2118
${CXX} -std=c++11 -g ${CXXFLAGS} -o translate type2.cpp translate.cpp
2219

2320
clean:
24-
rm -f oss-fuzz-client fuzz-client translate
21+
rm -f oss-fuzz-client translate

0 commit comments

Comments
 (0)