From 9ff7ddef9ff57edb835330c5f0bce881cf533acb Mon Sep 17 00:00:00 2001 From: nullprop Date: Mon, 13 Jan 2025 23:38:05 +0200 Subject: [PATCH] Update actions --- .forgejo/workflows/build.yml | 5 +++-- build-matrix.sh | 6 +----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index a757c3a..37904f8 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -15,8 +15,9 @@ jobs: run: | apt update apt install -y gcc gcc-multilib g++ g++-multilib \ - python3 pipx python3-pip python3-setuptools python3-wheel \ - ninja-build meson + python3 pipx python3-pip python3-setuptools python3-wheel ninja-build + pipx install meson + pipx ensurepath - name: Build run: ./build-matrix.sh diff --git a/build-matrix.sh b/build-matrix.sh index 05c1790..34f449b 100755 --- a/build-matrix.sh +++ b/build-matrix.sh @@ -35,11 +35,7 @@ BRANCHES=( ) ROOT=$(pwd) HL2SDK="$ROOT/include/hl2sdk" - -if [ -x "$(command -v meson)" ]; then - echo "meson is not installed" - exit 1 -fi +PATH="$PATH:/$HOME/.local/bin" # --depth=1 checkout in workflow runners has no branch info if [ "$CI" = "true" ]