From 76bc52905f84ee5c06b7ec697d77d6d46e193b00 Mon Sep 17 00:00:00 2001 From: Sergey Bronnikov Date: Tue, 20 Aug 2024 13:58:47 +0300 Subject: [PATCH 1/3] cfl: disable building protobuf library The patch disables building protobuf library, this will speed up overall build time significantly. --- .clusterfuzzlite/Dockerfile | 3 ++- .clusterfuzzlite/build.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.clusterfuzzlite/Dockerfile b/.clusterfuzzlite/Dockerfile index 1061003e..ecda1f66 100644 --- a/.clusterfuzzlite/Dockerfile +++ b/.clusterfuzzlite/Dockerfile @@ -8,7 +8,8 @@ FROM gcr.io/oss-fuzz-base/base-builder:v1 RUN apt-get update && apt-get install -y \ build-essential ninja-build cmake make \ - libreadline-dev libunwind-dev zlib1g-dev + libreadline-dev libunwind-dev zlib1g-dev \ + protobuf-compiler libprotobuf-dev COPY . $SRC/lua-c-api-tests WORKDIR $SRC/lua-c-api-tests diff --git a/.clusterfuzzlite/build.sh b/.clusterfuzzlite/build.sh index a9e930bb..8be75585 100755 --- a/.clusterfuzzlite/build.sh +++ b/.clusterfuzzlite/build.sh @@ -29,6 +29,7 @@ esac cmake_args=( -DUSE_LUAJIT=ON -DOSS_FUZZ=ON + -DENABLE_BUILD_PROTOBUF=OFF $SANITIZERS_ARGS # C compiler From 979d149a63d10dec2cb2cf2abdb6d246e4dbe5ec Mon Sep 17 00:00:00 2001 From: Sergey Bronnikov Date: Thu, 23 Jan 2025 16:02:36 +0300 Subject: [PATCH 2/3] cfl: ubuntu 20.04 -> 24.04 --- .github/workflows/cflite_batch.yml | 2 +- .github/workflows/cflite_build.yml | 2 +- .github/workflows/cflite_cron.yml | 4 ++-- .github/workflows/cflite_pr.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cflite_batch.yml b/.github/workflows/cflite_batch.yml index 5605787b..25193fd7 100644 --- a/.github/workflows/cflite_batch.yml +++ b/.github/workflows/cflite_batch.yml @@ -15,7 +15,7 @@ permissions: read-all jobs: luajit: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: diff --git a/.github/workflows/cflite_build.yml b/.github/workflows/cflite_build.yml index 89a639d8..743f2559 100644 --- a/.github/workflows/cflite_build.yml +++ b/.github/workflows/cflite_build.yml @@ -10,7 +10,7 @@ permissions: read-all jobs: luajit: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: diff --git a/.github/workflows/cflite_cron.yml b/.github/workflows/cflite_cron.yml index 3f3f2447..27778560 100644 --- a/.github/workflows/cflite_cron.yml +++ b/.github/workflows/cflite_cron.yml @@ -16,7 +16,7 @@ jobs: # are covered by fuzzing. Coverage: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup @@ -46,7 +46,7 @@ jobs: # code coverage. Pruning: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup diff --git a/.github/workflows/cflite_pr.yml b/.github/workflows/cflite_pr.yml index f9ca30d1..a46d0d76 100644 --- a/.github/workflows/cflite_pr.yml +++ b/.github/workflows/cflite_pr.yml @@ -35,7 +35,7 @@ permissions: read-all jobs: luajit: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: From 2888a3b5bf7e90adb2e3cfb0c9727d71907f96e8 Mon Sep 17 00:00:00 2001 From: Sergey Bronnikov Date: Thu, 11 Jan 2024 12:47:06 +0300 Subject: [PATCH 3/3] cmake: bump libprotobuf-mutator 1. https://github.com/google/libprotobuf-mutator/issues/222 2. https://github.com/google/libprotobuf-mutator/releases/tag/v1.3 (cherry picked from commit 5d6d126820f9d48fddaf797c58a54311c4ef0244) --- CMakePresets.json | 2 +- cmake/ProtobufMutator.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index b7722910..04b87368 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -41,7 +41,7 @@ }, "ENABLE_BUILD_PROTOBUF": { "type": "BOOL", - "value": "FALSE" + "value": "TRUE" } } }, diff --git a/cmake/ProtobufMutator.cmake b/cmake/ProtobufMutator.cmake index da63e27f..2160ff47 100644 --- a/cmake/ProtobufMutator.cmake +++ b/cmake/ProtobufMutator.cmake @@ -29,7 +29,7 @@ include (ExternalProject) ExternalProject_Add(${LPM_TARGET} PREFIX ${LPM_TARGET} GIT_REPOSITORY ${LPM_REPO} - GIT_TAG 212a7be + GIT_TAG v1.3 UPDATE_COMMAND "" CONFIGURE_COMMAND ${CMAKE_COMMAND} ${LPM_INSTALL_DIR}/src/${LPM_TARGET} -G${CMAKE_GENERATOR}