Skip to content

Fix Debian GitHub build & zstd CMake error #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Fix Debian GitHub build & zstd CMake error #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
88ada1b
Explicitly mark Git repo as safe
wonglkd Feb 28, 2023
8d1b65f
Pin zstd at 8420502e
wonglkd Feb 28, 2023
15bdec3
Incorporate requested changes
wonglkd Mar 1, 2023
892a74a
Move commit to L110 as suggested
wonglkd Mar 1, 2023
c97b8e7
Use GITHUB_WORKSPACE instead of hardcoding
wonglkd Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/build-cachelib-debian-10.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ jobs:
g++ - || true
- name: "checkout sources"
uses: actions/checkout@v2
- name: "Add Git safe directory"
# Workaround for Docker image bug (GitHub issue #199).
run: git config --system --add safe.directory $GITHUB_WORKSPACE
- name: "Install Prerequisites"
run: ./contrib/build.sh -S -B
- name: "Test: update-submodules"
Expand Down
8 changes: 6 additions & 2 deletions contrib/build-package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,12 @@ test "$#" -eq 0 \
&& die "missing dependancy name to build. See -h for help"

######################################
## Check which dependecy was requested
## Check which dependency was requested
######################################

external_git_clone=
external_git_branch=
# external_git_tag can also be used for commit hashes
external_git_tag=
update_submodules=
cmake_custom_params=
Expand Down Expand Up @@ -175,7 +176,10 @@ case "$1" in
REPODIR=cachelib/external/$NAME
SRCDIR=$REPODIR/build/cmake
external_git_clone=yes
external_git_branch=release
# Previously, we pinned to release branch. v1.5.4 needed
# CMake >= 3.18, later reverted. While waiting for v1.5.5,
# pin to the fix: https://github.com/facebook/zstd/pull/3510
external_git_tag=8420502e
if test "$build_tests" = "yes" ; then
cmake_custom_params="-DZSTD_BUILD_TESTS=ON"
else
Expand Down