Skip to content

Commit

Permalink
Install spdlog in CI, Nix and Dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
dominiklohmann committed Dec 10, 2020
1 parent 4214d7e commit 1b271fb
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/vast.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
if: matrix.os.tag == 'Ubuntu'
run: |
sudo apt-get -qq update
sudo apt-get -qqy install ninja-build libpcap-dev libssl-dev lsb-release ccache libflatbuffers-dev libyaml-cpp-dev
sudo apt-get -qqy install ninja-build libpcap-dev libssl-dev lsb-release ccache libflatbuffers-dev libyaml-cpp-dev libspdlog-dev
# Install Apache Arrow (c.f. https://arrow.apache.org/install/)
# TODO: Revert the commit that introduced this version pinning once ch20162
# is done and we can use latest upstream again.
Expand All @@ -116,7 +116,7 @@ jobs:
HOMEBREW_NO_AUTO_UPDATE: 1
run: |
brew --version
brew install libpcap tcpdump rsync pandoc apache-arrow pkg-config ninja ccache gnu-sed flatbuffers yaml-cpp
brew install libpcap tcpdump rsync pandoc apache-arrow pkg-config ninja ccache gnu-sed flatbuffers yaml-cpp spdlog
- name: Configure Environment
id: configure_env
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt-get -qq update && apt-get -qqy install \
build-essential gcc-8 g++-8 ninja-build libbenchmark-dev libpcap-dev tcpdump \
libssl-dev python3-dev python3-pip python3-venv git-core jq gnupg2 \
libyaml-cpp-dev
libyaml-cpp-dev libspdlog-dev
RUN pip3 install --upgrade pip && pip install --upgrade cmake && \
cmake --version

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_prebuilt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV PREFIX /usr/local

RUN apt-get -qq update && apt-get -qq install -y libasan5 libc++1 libc++abi1 \
libpcap0.8 openssl lsb-release python3 python3-pip jq tcpdump rsync wget \
libflatbuffers-dev libyaml-cpp-dev
libflatbuffers-dev libyaml-cpp-dev libspdlog-dev
# Install Apache Arrow (c.f. https://arrow.apache.org/install/)
# TODO: Revert the commit that introduced this version pinning once ch20162
# is done and we can use latest upstream again.
Expand Down
3 changes: 2 additions & 1 deletion nix/vast/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
, libpcap
, arrow-cpp
, flatbuffers
, spdlog
, libyamlcpp
, broker
, jemalloc
Expand Down Expand Up @@ -67,7 +68,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake cmake-format ];
propagatedNativeBuildInputs = [ pkgconfig pandoc ];
buildInputs = [ libpcap jemalloc broker libyamlcpp ]
buildInputs = [ libpcap jemalloc broker libyamlcpp spdlog ]
# Required for backtrace on musl libc.
++ lib.optional (isStatic && buildType == "CI") libexecinfo;
propagatedBuildInputs = [ arrow-cpp caf flatbuffers ];
Expand Down

0 comments on commit 1b271fb

Please sign in to comment.