From 3c963b8bede3078e3e32f6c576c37c6bcf7f1624 Mon Sep 17 00:00:00 2001 From: "LeChatP (Eddie BILLOIR)" Date: Thu, 9 May 2024 21:22:34 +0000 Subject: [PATCH] fix dependency and workflow --- .github/workflows/build.yml | 4 ++-- .github/workflows/quality.yml | 2 +- .github/workflows/tests.yml | 2 +- dependencies.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5fd11bdf..ce17b8d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: run: sudo apt-get update - name: Install Dependencies run: | - sudo ./dependencies.sh -yd + . ./dependencies.sh -yd sudo ./configure.sh -yd sudo sed -i 's/"immutable": true/"immutable": false/g' /etc/security/rootasrole.json echo "/home/runner/.cargo/bin" >> $GITHUB_PATH @@ -41,7 +41,7 @@ jobs: - name: Install Project env: PROFILE: debug - run: sudo -E make -e install + run: make -e install - name: Run Sr env: RUST_LOG: debug diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 7f336edb..6b5c80aa 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -40,7 +40,7 @@ jobs: override: true - name: Install Dependencies - run: sudo ./dependencies.sh -yd + run: . ./dependencies.sh -yd - name: Configure run: sudo ./configure.sh -yd diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8caaeeaf..d31598c6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,7 +25,7 @@ jobs: run: apt install sudo -y - name: Install Dependencies - run: sudo ./dependencies.sh -yd + run: . ./dependencies.sh -yd - name: Install file configuration run: sudo ./configure.sh -yd diff --git a/dependencies.sh b/dependencies.sh index 4ba6ec57..eee60d4e 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -12,7 +12,7 @@ while getopts "yd" opt; do done echo "Install Rust Cargo compiler" -if [ $(cargo &>/dev/null ; echo $?) -eq 0 ]; then +if [ $(command -v cargo &>/dev/null; echo $?) -eq 0 ]; then echo "Cargo is installed" else curl https://sh.rustup.rs -sSf | sh -s -- ${YES}