diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index d877a0c2dc5..6f1246a1215 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -48,7 +48,7 @@ jobs: # If you wish to specify custom queries, you can do so here or in a config file. # By default, queries listed here will override any specified in a config file. # Prefix the list here with "+" to use these queries and those in the config file. - + # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs # queries: security-extended,security-and-quality @@ -56,7 +56,7 @@ jobs: run: sudo apt update -y - name: Install build dependencies - run: sudo DEBIAN_FRONTEND=noninteractive apt install libssl-dev libyaml-dev libc-ares-dev libprotobuf-dev protobuf-compiler libjq-dev libyaml-cpp-dev libgrpc++-dev protobuf-compiler-grpc rpm libelf-dev cmake build-essential libcurl4-openssl-dev linux-headers-$(uname -r) clang llvm git -y + run: sudo DEBIAN_FRONTEND=noninteractive apt install libssl-dev libc-ares-dev libprotobuf-dev protobuf-compiler libyaml-cpp-dev libgrpc++-dev protobuf-compiler-grpc rpm libelf-dev cmake build-essential libcurl4-openssl-dev linux-headers-$(uname -r) clang llvm git -y - name: Prepare project run: | diff --git a/.github/workflows/reusable_build_dev.yaml b/.github/workflows/reusable_build_dev.yaml index 8ecbd5d1c7b..35cd76b2c85 100644 --- a/.github/workflows/reusable_build_dev.yaml +++ b/.github/workflows/reusable_build_dev.yaml @@ -27,14 +27,14 @@ on: required: false default: '' type: string - + jobs: build-and-test: # See https://github.com/actions/runner/issues/409#issuecomment-1158849936 runs-on: ${{ (inputs.arch == 'aarch64' && fromJSON('[ "self-hosted", "linux", "ARM64" ]')) || 'ubuntu-22.04' }} container: ${{ (inputs.arch == 'aarch64' && 'ubuntu:22.04') || '' }} outputs: - cmdout: ${{ steps.run_cmd.outputs.out }} + cmdout: ${{ steps.run_cmd.outputs.out }} steps: - name: Checkout uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 @@ -44,14 +44,14 @@ jobs: - name: Update base image run: sudo apt update -y - + - name: Install build dependencies - run: sudo DEBIAN_FRONTEND=noninteractive apt install libjq-dev libelf-dev libyaml-cpp-dev cmake build-essential git -y + run: sudo DEBIAN_FRONTEND=noninteractive apt install libelf-dev libyaml-cpp-dev cmake build-essential git -y - name: Install build dependencies (non-minimal) if: inputs.minimal != true - run: sudo DEBIAN_FRONTEND=noninteractive apt install libssl-dev libyaml-dev libc-ares-dev libprotobuf-dev protobuf-compiler libgrpc++-dev protobuf-compiler-grpc rpm libcurl4-openssl-dev linux-headers-$(uname -r) clang llvm -y - + run: sudo DEBIAN_FRONTEND=noninteractive apt install libssl-dev libc-ares-dev libprotobuf-dev protobuf-compiler libgrpc++-dev protobuf-compiler-grpc rpm libcurl4-openssl-dev linux-headers-$(uname -r) clang llvm -y + - name: Prepare project run: | mkdir build @@ -74,7 +74,7 @@ jobs: - name: Run unit tests run: | pushd build - sudo ./unit_tests/falco_unit_tests + sudo ./unit_tests/falco_unit_tests popd - name: Run command diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake index e817922fbe8..e7eddad1a54 100644 --- a/cmake/modules/falcosecurity-libs.cmake +++ b/cmake/modules/falcosecurity-libs.cmake @@ -26,14 +26,14 @@ if(FALCOSECURITY_LIBS_SOURCE_DIR) else() # FALCOSECURITY_LIBS_REPO accepts a repository name (/) alternative to the falcosecurity/libs repository. # In case you want to test against a fork of falcosecurity/libs just pass the variable - - # ie., `cmake -DFALCOSECURITY_LIBS_REPO=/libs ..` + # ie., `cmake -DFALCOSECURITY_LIBS_REPO=/libs ..` if (NOT FALCOSECURITY_LIBS_REPO) set(FALCOSECURITY_LIBS_REPO "falcosecurity/libs") endif() # FALCOSECURITY_LIBS_VERSION accepts a git reference (branch name, commit hash, or tag) to the falcosecurity/libs repository. # In case you want to test against another falcosecurity/libs version (or branch, or commit) just pass the variable - - # ie., `cmake -DFALCOSECURITY_LIBS_VERSION=dev ..` + # ie., `cmake -DFALCOSECURITY_LIBS_VERSION=dev ..` if(NOT FALCOSECURITY_LIBS_VERSION) set(FALCOSECURITY_LIBS_VERSION "fb175515055254f74d3f2587862d32a173dafa54") set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=4db26e92f340594a95666978ac235c1a045dd76c8e10f66c2da6054aedc96485") @@ -84,12 +84,10 @@ set(CREATE_TEST_TARGETS OFF CACHE BOOL "") set(BUILD_LIBSCAP_EXAMPLES OFF CACHE BOOL "") set(USE_BUNDLED_TBB ON CACHE BOOL "") -set(USE_BUNDLED_B64 ON CACHE BOOL "") set(USE_BUNDLED_JSONCPP ON CACHE BOOL "") set(USE_BUNDLED_VALIJSON ON CACHE BOOL "") set(USE_BUNDLED_RE2 ON CACHE BOOL "") set(USE_BUNDLED_UTHASH ON CACHE BOOL "") -set(USE_BUNDLED_TINYDIR ON CACHE BOOL "") list(APPEND CMAKE_MODULE_PATH "${FALCOSECURITY_LIBS_SOURCE_DIR}/cmake/modules") diff --git a/cmake/modules/libyaml.cmake b/cmake/modules/libyaml.cmake deleted file mode 100644 index b14ac5333f1..00000000000 --- a/cmake/modules/libyaml.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright (C) 2023 The Falco Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -# specific language governing permissions and limitations under the License. -# - -set(LIBYAML_SRC "${PROJECT_BINARY_DIR}/libyaml-prefix/src/libyaml") -set(LIBYAML_INSTALL_DIR "${LIBYAML_SRC}/target") -message(STATUS "Using bundled libyaml in '${LIBYAML_SRC}'") -set(LIBYAML_LIB "${LIBYAML_SRC}/src/.libs/libyaml.a") -externalproject_add( - libyaml - URL "https://github.com/yaml/libyaml/releases/download/0.2.5/yaml-0.2.5.tar.gz" - URL_HASH "SHA256=c642ae9b75fee120b2d96c712538bd2cf283228d2337df2cf2988e3c02678ef4" - CONFIGURE_COMMAND ./configure --prefix=${LIBYAML_INSTALL_DIR} CFLAGS=-fPIC CPPFLAGS=-fPIC --enable-static=true --enable-shared=false - BUILD_COMMAND ${CMD_MAKE} - BUILD_IN_SOURCE 1 - BUILD_BYPRODUCTS ${LIBYAML_LIB} - INSTALL_COMMAND ${CMD_MAKE} install -)