Skip to content

Commit b8f7c92

Browse files
[fixup] Wrong deps acquisition command
1 parent 2c03352 commit b8f7c92

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

Earthfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ BOOTSTRAP_DEPS:
120120
ARG use_vcpkg=true
121121
IF ! __bool $use_vcpkg
122122
# No vcpkg. Install system dependencies
123-
COPY tools/ci/install-third-deps.sh /
124-
RUN bash /install-third-deps.sh
123+
ARG third_deps
124+
RUN __install $third_deps
125125
# Install system deps for testing, if needed
126126
ARG test_deps
127127
ARG test=true

tools/ci/install-third-deps.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/usr/bin/env sh
2+
3+
# This script is used in CI processes to install the build-time-dependencies
4+
# for the system package manager, not using vcpkg. This relies on the __install
5+
# script being present.
6+
7+
set -eu
8+
9+
if test -f /etc/debian_version; then
10+
__install libfmt-dev libboost-url-dev libboost-container-dev libssl-dev \
11+
|| __install libfmt-dev libboost-url1.81-dev libboost-container1.81-dev libssl-dev
12+
fi
13+
14+
if test -f /etc/alpine-release; then
15+
__install fmt-dev boost-dev openssl-dev
16+
fi
17+
18+
if test -f /etc/redhat-release; then
19+
__install boost-devel boost-url fmt-devel openssl-devel
20+
fi

0 commit comments

Comments
 (0)