Skip to content

Commit 29f09f7

Browse files
authored
build-scx-scheds: check for PIPX_BIN_DIR (#191)
It turns out github-hosted runners have pipx installed by default, and PIPX_BIN_DIR set. We still want pipx, meson and ninja to be the same between self-hosted and github-hosted runners, so just make sure PIPX_BIN_DIR is right before trying to copy the symlinks. Signed-off-by: Ihor Solodrai <[email protected]>
1 parent e99a313 commit 29f09f7

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

build-scx-scheds/install-dependencies.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ chmod +x pipx.pyz && sudo mv pipx.pyz /usr/bin/pipx
1616

1717
# pipx ensurepath is not doing what we need
1818
# install pipx apps to /usr/local/bin manually
19+
export PIPX_BIN_DIR=${PIPX_BIN_DIR:-~/.local/bin}
1920
pipx install meson
2021
pipx install ninja
21-
sudo cp -a ~/.local/bin/meson /usr/local/bin
22-
sudo cp -a ~/.local/bin/ninja /usr/local/bin
22+
sudo cp -a "${PIPX_BIN_DIR}/meson" /usr/local/bin
23+
sudo cp -a "${PIPX_BIN_DIR}/ninja" /usr/local/bin
2324

24-
meson --version
25-
ninja --version
25+
echo "meson --version" && meson --version
26+
echo "ninja --version" && ninja --version
2627

2728
# Install LLVM
2829
sudo -E apt-get --no-install-recommends -y install lsb-release wget software-properties-common gnupg

0 commit comments

Comments
 (0)