Add a static binary workflow #966
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| name: "VAST Static" | ||
| on: | ||
| repository_dispatch: | ||
| types: static-binary | ||
| push: | ||
| branches: | ||
| - master | ||
| pull_request: | ||
| paths: | ||
| - '.github/workflows/static-binary.yaml' | ||
| release: | ||
| types: published | ||
|
|
||
| jobs: | ||
| static_binary: | ||
| runs-on: ubuntu-latest | ||
| name: Static Binary | ||
| env: | ||
| BUILD_DIR: build | ||
| STATIC_BINARY_TARGET: ${{ github.event.client_payload.args == '' && 'vast' || github.event.client_payload.args }} | ||
| steps: | ||
| - name: Checkout | ||
| if: github.event_name == 'repository_dispatch' | ||
| uses: actions/checkout@v1 | ||
| with: | ||
| ref: ${{ github.event.client_payload.ref == '' && 'master' || github.event.client_payload.ref }} | ||
|
|
||
| - name: Checkout | ||
| if: github.event_name != 'repository_dispatch' | ||
| uses: actions/checkout@v1 | ||
|
|
||
| - name: Install Nix | ||
| uses: cachix/install-nix-action@v10 | ||
|
|
||
| - name: Setup Cachix | ||
| uses: cachix/cachix-action@v6 | ||
| with: | ||
| name: vast | ||
| signingKey: '${{ secrets.CACHIX_VAST_SIGNING_KEY }}' | ||
|
|
||
| - name: Build a Static Binary | ||
| run: | | ||
| nix/static-binary.sh --use-head | ||
|
|
||
| - name: Create Paths | ||
| id: create_paths | ||
| run: | | ||
| ARTIFACT_NAME=$(ls "${BUILD_DIR}" | grep "vast.*.tar.gz") | ||
| echo "::set-output name=artifact_name::${ARTIFACT_NAME}" | ||
|
|
||
| - name: Upload Artifact to Github | ||
| uses: actions/upload-artifact@v1 | ||
| with: | ||
| name: "${{ steps.create_paths.outputs.artifact_name }}" | ||
| path: "${{ env.BUILD_DIR }}/${{ steps.create_paths.outputs.artifact_name }}" | ||
|
|
||
| - name: Publish to GitHub Release | ||
| if: github.event_name == 'release' && github.event.action == 'published' | ||
| uses: actions/upload-release-asset@v1.0.1 | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ github.event.release.upload_url }} | ||
| asset_path: "${{ env.BUILD_DIR }}/${{ steps.create_paths.outputs.artifact_name }}" | ||
| # The asset name is constant so we can permanently link to | ||
| # https://github.com/tenzir/vast/releases/latest/download/vast-linux-static.tar.gz | ||
| # for a build of the latest release. | ||
| asset_name: "vast-linux-static.tar.gz" | ||
| asset_content_type: application/gzip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ | |
|
|
||
| # Build artifacts | ||
| /build*/ | ||
| /nix/build/ | ||
| /compile_commands.json | ||
| .mypy_cache/ | ||
| __pycache__/ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,13 @@ set(ZSTD_STATIC_LIB_NAME | |
| ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX}) | ||
|
|
||
| # First, find via if specified ZTD_ROOT | ||
| if (NOT ZSTD_ROOT) | ||
| # We look for an environment variable of the same name too, because | ||
| # that can be provided by a tool like nix-shell or docker. Wo do this | ||
| # so the user doesn't have to remember to add "-DZSTD_ROOT=..." to their | ||
| # cmake invocations. | ||
|
Comment on lines
+27
to
+30
There was a problem hiding this comment. Having this for some variables but not all is really confusing and makes maintenance of the CMake way harder. I'm already always afraid to change CMake code because it might break the Nix build. There was a problem hiding this comment. This is essentially a workaround for a bug in the generated |
||
| set(ZSTD_ROOT "$ENV{ZSTD_ROOT}") | ||
| endif () | ||
| if (ZSTD_ROOT) | ||
| message(STATUS "Using ZSTD_ROOT: ${ZSTD_ROOT}") | ||
| find_library( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| diff --git a/cmake_modules/ArrowJemallocTarget.cmake.in b/cmake_modules/ArrowJemallocTarget.cmake.in | ||
| new file mode 100644 | ||
| index 000000000..123fdf4b7 | ||
| --- /dev/null | ||
| +++ b/cmake_modules/ArrowJemallocTarget.cmake.in | ||
| @@ -0,0 +1,18 @@ | ||
| + | ||
| +# Compute the installation prefix relative to this file. | ||
| +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) | ||
| +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) | ||
| +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) | ||
| +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) | ||
| +if(_IMPORT_PREFIX STREQUAL "/") | ||
| + set(_IMPORT_PREFIX "") | ||
| +endif() | ||
| + | ||
| +add_library(jemalloc::jemalloc STATIC IMPORTED) | ||
| +set_target_properties(jemalloc::jemalloc | ||
| + PROPERTIES INTERFACE_LINK_LIBRARIES | ||
| + Threads::Threads) | ||
| +set_property(TARGET jemalloc::jemalloc APPEND PROPERTY IMPORTED_CONFIGURATIONS @CMAKE_BUILD_TYPE@) | ||
| +set_target_properties(jemalloc::jemalloc PROPERTIES | ||
| + IMPORTED_LINK_INTERFACE_LANGUAGES_@CMAKE_BUILD_TYPE@ "C;CXX" | ||
| + IMPORTED_LOCATION_@CMAKE_BUILD_TYPE@ "${_IMPORT_PREFIX}/lib/arrow/@JEMALLOC_STATIC_NAME@") | ||
| diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake | ||
| index ba3138d20..2722968fd 100644 | ||
| --- a/cmake_modules/ThirdpartyToolchain.cmake | ||
| +++ b/cmake_modules/ThirdpartyToolchain.cmake | ||
| @@ -1308,8 +1308,9 @@ if(ARROW_JEMALLOC) | ||
| set(ARROW_JEMALLOC_USE_SHARED OFF) | ||
| set(JEMALLOC_PREFIX | ||
| "${CMAKE_CURRENT_BINARY_DIR}/jemalloc_ep-prefix/src/jemalloc_ep/dist/") | ||
| + set(JEMALLOC_STATIC_NAME "libjemalloc_pic${CMAKE_STATIC_LIBRARY_SUFFIX}") | ||
| set(JEMALLOC_STATIC_LIB | ||
| - "${JEMALLOC_PREFIX}/lib/libjemalloc_pic${CMAKE_STATIC_LIBRARY_SUFFIX}") | ||
| + "${JEMALLOC_PREFIX}/lib/${JEMALLOC_STATIC_NAME}") | ||
| set(JEMALLOC_CONFIGURE_COMMAND ./configure "AR=${CMAKE_AR}" "CC=${CMAKE_C_COMPILER}") | ||
| if(CMAKE_OSX_SYSROOT) | ||
| list(APPEND JEMALLOC_CONFIGURE_COMMAND "SDKROOT=${CMAKE_OSX_SYSROOT}") | ||
| @@ -1353,6 +1354,14 @@ if(ARROW_JEMALLOC) | ||
| INTERFACE_INCLUDE_DIRECTORIES | ||
| "${CMAKE_CURRENT_BINARY_DIR}/jemalloc_ep-prefix/src") | ||
| add_dependencies(jemalloc::jemalloc jemalloc_ep) | ||
| + if(ARROW_BUILD_STATIC) | ||
| + install(FILES "${JEMALLOC_STATIC_LIB}" | ||
| + DESTINATION "${CMAKE_INSTALL_LIBDIR}/arrow") | ||
| + configure_file("${PROJECT_SOURCE_DIR}/cmake_modules/ArrowJemallocTarget.cmake.in" | ||
| + "${CMAKE_CURRENT_BINARY_DIR}/ArrowJemallocTarget.cmake" @ONLY) | ||
| + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ArrowJemallocTarget.cmake" | ||
| + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/arrow") | ||
| + endif() | ||
| endif() | ||
|
|
||
| # ---------------------------------------------------------------------- | ||
| diff --git a/src/arrow/ArrowConfig.cmake.in b/src/arrow/ArrowConfig.cmake.in | ||
| index 0e595066d..c52e3cb07 100644 | ||
| --- a/src/arrow/ArrowConfig.cmake.in | ||
| +++ b/src/arrow/ArrowConfig.cmake.in | ||
| @@ -39,5 +39,8 @@ include("${CMAKE_CURRENT_LIST_DIR}/ArrowOptions.cmake") | ||
| # Load targets only once. If we load targets multiple times, CMake reports | ||
| # already existent target error. | ||
| if(NOT (TARGET arrow_shared OR TARGET arrow_static)) | ||
| + if(ARROW_BUILD_STATIC AND ARROW_JEMALLOC) | ||
| + include("${CMAKE_CURRENT_LIST_DIR}/ArrowJemallocTarget.cmake") | ||
| + endif() | ||
| include("${CMAKE_CURRENT_LIST_DIR}/ArrowTargets.cmake") | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| { stdenv, lib, fetchgit, cmake, caf, openssl, python, ncurses | ||
| , static ? stdenv.hostPlatform.isMusl | ||
| , linkTimeOptimization ? static }: | ||
|
|
||
| let | ||
| source = builtins.fromJSON (builtins.readFile ./source.json); | ||
| isCross = stdenv.buildPlatform != stdenv.hostPlatform; | ||
| fixODR = static && linkTimeOptimization; | ||
| in | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "broker"; | ||
| version = builtins.substring 0 10 source.date; | ||
|
|
||
| src = lib.callPackageWith source fetchgit {}; | ||
|
|
||
| nativeBuildInputs = [ cmake ]; | ||
| buildInputs = [ caf openssl ] | ||
| ++ lib.optionals (!static) [ python ncurses ]; | ||
|
|
||
| cmakeFlags = [ | ||
| "-DBUILD_SHARED_LIBS=ON" | ||
| "-DBROKER_DISABLE_DOCS=ON" | ||
| "-DCAF_ROOT_DIR=${caf}" | ||
| "-DPY_MOD_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}" | ||
| ] ++ lib.optionals static [ | ||
| "-DENABLE_STATIC_ONLY=ON" | ||
| "-DOPENSSL_USE_STATIC_LIBS=TRUE" | ||
| ] ++ lib.optionals linkTimeOptimization [ | ||
| "-DCMAKE_POLICY_DEFAULT_CMP0069=NEW" | ||
| "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=ON" | ||
| ] ++ lib.optionals isCross [ | ||
| "-DBROKER_DISABLE_TESTS=ON" | ||
| ]; | ||
| hardeningDisable = lib.optional static "pic"; | ||
| dontStrip = static; | ||
|
|
||
| patches = [ ./fix_static_linkage.patch ]; | ||
|
|
||
| meta = with lib; { | ||
| description = "Zeek networking layer"; | ||
| homepage = http://zeek.io/; | ||
| license = licenses.bsd3; | ||
| platforms = platforms.unix; | ||
| maintainers = with maintainers; [ tobim ]; | ||
| }; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed by mistake? This doesn't look right to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The intention is to use the environment variable if the option has not been given explicitly. The order of precedence is now:
explicit option > environment > default (implicitly off because the empty string is treated as False).
The reason I changed these is that I can use nix to set up an environment for a static build like so:
nix-shell -E 'let pkgs = import ./nix { }; in import ./shell.nix {pkgs = pkgs.pkgsStatic;}'The toolchain in this environment is not capable to produce shared libraries, so one has to pass several options to CMake to get a working build tree with a configuration similar to the static build in CI:
With the changes to CMake adding these options is not required, while the regular build is not affected.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I really don't like how inconsistent this is. Can you create a follow-up story for a) prefixing all CMake variables that the user can set with
VAST_, and b) for exposing them on the command line like this?