refactor(ci): Avoid using command make directly

Signed-off-by: Federico Aponte <federico.aponte@sysdig.com>
This commit is contained in:
Federico Aponte 2024-02-20 09:17:00 +01:00 committed by poiana
parent a5297c4f29
commit 3954ff233b
5 changed files with 64 additions and 85 deletions

View File

@ -60,16 +60,11 @@ jobs:
- name: Prepare project - name: Prepare project
run: | run: |
mkdir build cmake -B build -S . -DBUILD_BPF=On -DUSE_BUNDLED_DEPS=Off -DUSE_BUNDLED_NLOHMANN_JSON=On -DUSE_BUNDLED_CXXOPTS=On -DUSE_BUNDLED_CPPHTTPLIB=On
pushd build
cmake -DBUILD_BPF=On -DUSE_BUNDLED_DEPS=Off -DUSE_BUNDLED_NLOHMANN_JSON=On -DUSE_BUNDLED_CXXOPTS=On -DUSE_BUNDLED_CPPHTTPLIB=On ..
popd
- name: Build - name: Build
run: | run: |
pushd build KERNELDIR=/lib/modules/$(uname -r)/build cmake --build build -j4
KERNELDIR=/lib/modules/$(uname -r)/build make -j4 all
popd
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5 uses: github/codeql-action/analyze@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5

View File

@ -53,9 +53,7 @@ jobs:
- name: Prepare project - name: Prepare project
run: | run: |
mkdir build cmake -B build -S .\
pushd build
cmake \
-DBUILD_FALCO_UNIT_TESTS=On \ -DBUILD_FALCO_UNIT_TESTS=On \
-DCMAKE_BUILD_TYPE=${{ inputs.build_type }} \ -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} \
-DBUILD_BPF=${{ inputs.minimal == true && 'OFF' || 'ON' }} \ -DBUILD_BPF=${{ inputs.minimal == true && 'OFF' || 'ON' }} \
@ -65,14 +63,10 @@ jobs:
-DUSE_BUNDLED_NLOHMANN_JSON=On \ -DUSE_BUNDLED_NLOHMANN_JSON=On \
-DUSE_BUNDLED_CXXOPTS=On \ -DUSE_BUNDLED_CXXOPTS=On \
-DUSE_BUNDLED_CPPHTTPLIB=On \ -DUSE_BUNDLED_CPPHTTPLIB=On \
..
popd
- name: Build - name: Build
run: | run: |
pushd build KERNELDIR=/lib/modules/$(uname -r)/build cmake --build build -j4
KERNELDIR=/lib/modules/$(uname -r)/build make -j4 all
popd
- name: Run unit tests - name: Run unit tests
run: | run: |

View File

@ -27,9 +27,9 @@ jobs:
- name: Build modern BPF skeleton - name: Build modern BPF skeleton
run: | run: |
mkdir skeleton-build && cd skeleton-build cmake -B skeleton-build -S . \
cmake -DUSE_BUNDLED_DEPS=ON -DBUILD_FALCO_MODERN_BPF=ON -DCREATE_TEST_TARGETS=Off -DFALCO_VERSION=${{ inputs.version }} .. -DUSE_BUNDLED_DEPS=ON -DBUILD_FALCO_MODERN_BPF=ON -DCREATE_TEST_TARGETS=Off -DFALCO_VERSION=${{ inputs.version }}
make ProbeSkeleton -j6 cmake --build skeleton-build --target ProbeSkeleton -j6
- name: Upload skeleton - name: Upload skeleton
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
@ -64,17 +64,13 @@ jobs:
- name: Install updated cmake - name: Install updated cmake
run: | run: |
curl -L -o /tmp/cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.22.5/cmake-3.22.5-linux-$(uname -m).tar.gz curl -L https://github.com/Kitware/CMake/releases/download/v3.22.5/cmake-3.22.5-linux-$(uname -m).tar.gz \
gzip -d /tmp/cmake.tar.gz | tar --directory=/usr --strip-components=1 -xzp
tar -xpf /tmp/cmake.tar --directory=/tmp
cp -R /tmp/cmake-3.22.5-linux-$(uname -m)/* /usr
rm -rf /tmp/cmake-3.22.5-linux-$(uname -m)
- name: Prepare project - name: Prepare project
run: | run: |
mkdir build && cd build
source /opt/rh/devtoolset-9/enable source /opt/rh/devtoolset-9/enable
cmake \ cmake -B build -S . \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DUSE_BUNDLED_DEPS=On \ -DUSE_BUNDLED_DEPS=On \
-DFALCO_ETC_DIR=/etc/falco \ -DFALCO_ETC_DIR=/etc/falco \
@ -82,20 +78,17 @@ jobs:
-DMODERN_BPF_SKEL_DIR=/tmp \ -DMODERN_BPF_SKEL_DIR=/tmp \
-DBUILD_DRIVER=Off \ -DBUILD_DRIVER=Off \
-DBUILD_BPF=Off \ -DBUILD_BPF=Off \
-DFALCO_VERSION=${{ inputs.version }} \ -DFALCO_VERSION=${{ inputs.version }}
..
- name: Build project - name: Build project
run: | run: |
cd build
source /opt/rh/devtoolset-9/enable source /opt/rh/devtoolset-9/enable
make falco -j6 cmake --build build --target falco -j6
- name: Build packages - name: Build packages
run: | run: |
cd build
source /opt/rh/devtoolset-9/enable source /opt/rh/devtoolset-9/enable
make package cmake --build build --target package
- name: Upload Falco tar.gz package - name: Upload Falco tar.gz package
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
@ -139,18 +132,19 @@ jobs:
- name: Prepare project - name: Prepare project
run: | run: |
mkdir build && cd build cmake -B build -S . \
cmake -DCPACK_GENERATOR=TGZ -DBUILD_BPF=Off -DBUILD_DRIVER=Off -DCMAKE_BUILD_TYPE=Release -DUSE_BUNDLED_DEPS=On -DUSE_BUNDLED_LIBELF=Off -DBUILD_LIBSCAP_MODERN_BPF=ON -DMUSL_OPTIMIZED_BUILD=On -DFALCO_ETC_DIR=/etc/falco ../ -DFALCO_VERSION=${{ inputs.version }} -DCMAKE_BUILD_TYPE=Release \
-DCPACK_GENERATOR=TGZ \
-DBUILD_BPF=Off -DBUILD_DRIVER=Off \
-DUSE_BUNDLED_DEPS=On -DUSE_BUNDLED_LIBELF=Off -DBUILD_LIBSCAP_MODERN_BPF=ON -DMUSL_OPTIMIZED_BUILD=On -DFALCO_ETC_DIR=/etc/falco -DFALCO_VERSION=${{ inputs.version }}
- name: Build project - name: Build project
run: | run: |
cd build cmake --build build -j6
make -j6 all
- name: Build packages - name: Build packages
run: | run: |
cd build cmake --build build -j6 --target package
make -j6 package
- name: Rename static package - name: Rename static package
run: | run: |
@ -186,8 +180,7 @@ jobs:
- name: Prepare project - name: Prepare project
run: | run: |
mkdir build && cd build emcmake cmake -B build -S . \
emcmake cmake \
-DBUILD_BPF=Off \ -DBUILD_BPF=Off \
-DBUILD_DRIVER=Off \ -DBUILD_DRIVER=Off \
-DBUILD_LIBSCAP_MODERN_BPF=OFF \ -DBUILD_LIBSCAP_MODERN_BPF=OFF \
@ -195,8 +188,7 @@ jobs:
-DUSE_BUNDLED_DEPS=On \ -DUSE_BUNDLED_DEPS=On \
-DFALCO_ETC_DIR=/etc/falco \ -DFALCO_ETC_DIR=/etc/falco \
-DBUILD_FALCO_UNIT_TESTS=On \ -DBUILD_FALCO_UNIT_TESTS=On \
-DFALCO_VERSION=${{ inputs.version }} \ -DFALCO_VERSION=${{ inputs.version }}
..
- name: Build project - name: Build project
run: | run: |
@ -229,11 +221,10 @@ jobs:
with: with:
fetch-depth: 0 fetch-depth: 0
# NOTE: Backslash doesn't work as line continuation on Windows.
- name: Prepare project - name: Prepare project
run: | run: |
mkdir build cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DMINIMAL_BUILD=On -DUSE_BUNDLED_DEPS=On -DBUILD_FALCO_UNIT_TESTS=On -DFALCO_VERSION=${{ inputs.version }}
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DMINIMAL_BUILD=On -DUSE_BUNDLED_DEPS=On -DBUILD_FALCO_UNIT_TESTS=On -DFALCO_VERSION=${{ inputs.version }} ..
- name: Build project - name: Build project
run: | run: |
@ -267,9 +258,8 @@ jobs:
- name: Prepare project - name: Prepare project
run: | run: |
mkdir build cmake -B build -S . \
cd build -DMINIMAL_BUILD=On -DUSE_BUNDLED_DEPS=On -DBUILD_FALCO_UNIT_TESTS=On -DFALCO_VERSION=${{ inputs.version }}
cmake -DMINIMAL_BUILD=On -DUSE_BUNDLED_DEPS=On -DBUILD_FALCO_UNIT_TESTS=On -DFALCO_VERSION=${{ inputs.version }} ..
- name: Build project - name: Build project
run: | run: |

View File

@ -30,8 +30,7 @@ jobs:
- name: Configure project - name: Configure project
run: | run: |
mkdir build && cd build cmake -B build -S . -DUSE_BUNDLED_DEPS=On -DUSE_DYNAMIC_LIBELF=Off
cmake -DUSE_BUNDLED_DEPS=On -DUSE_DYNAMIC_LIBELF=Off ..
- name: Load and store Falco version output - name: Load and store Falco version output
id: store_version id: store_version

View File

@ -19,10 +19,11 @@ jobs:
- name: Build and run cppcheck 🏎️ - name: Build and run cppcheck 🏎️
run: | run: |
mkdir build cmake -B build -S . \
cd build && cmake -DUSE_BUNDLED_DEPS=On -DUSE_DYNAMIC_LIBELF=Off -DBUILD_WARNINGS_AS_ERRORS=ON -DCREATE_TEST_TARGETS=Off -DCMAKE_BUILD_TYPE="release" -DBUILD_BPF=Off -DBUILD_DRIVER=Off .. -DCMAKE_BUILD_TYPE="release" \
make -j4 cppcheck -DUSE_BUNDLED_DEPS=On -DUSE_DYNAMIC_LIBELF=Off -DBUILD_WARNINGS_AS_ERRORS=ON -DCREATE_TEST_TARGETS=Off -DBUILD_BPF=Off -DBUILD_DRIVER=Off
make -j4 cppcheck_htmlreport cmake --build build -j4 --target cppcheck
cmake --build build -j4 --target cppcheck_htmlreport
- name: Upload reports ⬆️ - name: Upload reports ⬆️
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3