From aff486dac13a887308498ce3a6bbfc0c5ad93de9 Mon Sep 17 00:00:00 2001 From: Nikita Mikhaylov Date: Tue, 26 Sep 2023 15:59:57 +0200 Subject: [PATCH] Additional scripts for packager (#55000) --- docker/packager/binary/build.sh | 21 ++++++++++++++++----- packages/.gitignore | 1 + packages/pre-build/example.sh | 3 +++ 3 files changed, 20 insertions(+), 5 deletions(-) create mode 100755 packages/pre-build/example.sh diff --git a/docker/packager/binary/build.sh b/docker/packager/binary/build.sh index 11efffd592c..93de6eeb374 100755 --- a/docker/packager/binary/build.sh +++ b/docker/packager/binary/build.sh @@ -55,6 +55,17 @@ ccache_status # clear cache stats ccache --zero-stats ||: +# Check whether the directory with pre-build scripts exists and not empty. +if [ -d "/build/packages/pre-build" ] && [ -z "$(ls -A /build/packages/pre-build)" ]; then + echo "There are no subcommands to execute :)" +else + # Execute all commands + for file in /build/packages/pre-build/*.sh ; + do + bash "$file" + done +fi + if [ "$BUILD_MUSL_KEEPER" == "1" ] then # build keeper with musl separately @@ -73,13 +84,13 @@ then fi rm -f CMakeCache.txt - # Build the rest of binaries - cmake --debug-trycompile -DBUILD_STANDALONE_KEEPER=0 -DCREATE_KEEPER_SYMLINK=0 -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" .. -else - # Build everything - cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" .. + # Modify CMake flags, so we won't overwrite standalone keeper with symlinks + CMAKE_FLAGS+=(-DBUILD_STANDALONE_KEEPER=0 -DCREATE_KEEPER_SYMLINK=0) fi +# Build everything +cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" .. + # No quotes because I want it to expand to nothing if empty. # shellcheck disable=SC2086 # No quotes because I want it to expand to nothing if empty. ninja $NINJA_FLAGS $BUILD_TARGET diff --git a/packages/.gitignore b/packages/.gitignore index 355164c1265..69cf3a785e4 100644 --- a/packages/.gitignore +++ b/packages/.gitignore @@ -1 +1,2 @@ */ +!pre-build/ diff --git a/packages/pre-build/example.sh b/packages/pre-build/example.sh new file mode 100755 index 00000000000..2e361d6ca44 --- /dev/null +++ b/packages/pre-build/example.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +echo "This is an example pre-build script!"