From dea1ea5688f85de0be9997ddcce2ac58409785d9 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 27 Sep 2025 17:12:32 -0700 Subject: [PATCH] move mull install to setup.sh --- opendbc/safety/tests/install_mull.sh | 11 ----------- opendbc/safety/tests/mutation.sh | 1 - setup.sh | 9 +++++++++ 3 files changed, 9 insertions(+), 12 deletions(-) delete mode 100755 opendbc/safety/tests/install_mull.sh diff --git a/opendbc/safety/tests/install_mull.sh b/opendbc/safety/tests/install_mull.sh deleted file mode 100755 index 75b1042e..00000000 --- a/opendbc/safety/tests/install_mull.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash -set -e - -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" -cd $DIR - -if ! command -v "mull-runner-17" > /dev/null 2>&1; then - sudo apt-get update && sudo apt-get install -y curl clang-17 - curl -1sLf 'https://dl.cloudsmith.io/public/mull-project/mull-stable/setup.deb.sh' | sudo -E bash - sudo apt-get update && sudo apt-get install -y mull-17 -fi diff --git a/opendbc/safety/tests/mutation.sh b/opendbc/safety/tests/mutation.sh index 8b3b7c36..57db7554 100755 --- a/opendbc/safety/tests/mutation.sh +++ b/opendbc/safety/tests/mutation.sh @@ -5,7 +5,6 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" cd $DIR source $DIR/../../../setup.sh -$DIR/install_mull.sh GIT_REF="${GIT_REF:-origin/master}" GIT_ROOT=$(git rev-parse --show-toplevel) diff --git a/setup.sh b/setup.sh index 29c5bf2c..dce0a226 100755 --- a/setup.sh +++ b/setup.sh @@ -7,6 +7,15 @@ BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" export PYTHONPATH=$BASEDIR # *** dependencies install *** +if [ "$(uname -s)" = "Linux" ]; then + # TODO: add macOS support + if ! command -v "mull-runner-17" > /dev/null 2>&1; then + sudo apt-get update && sudo apt-get install -y curl clang-17 + curl -1sLf 'https://dl.cloudsmith.io/public/mull-project/mull-stable/setup.deb.sh' | sudo -E bash + sudo apt-get update && sudo apt-get install -y mull-17 + fi +fi + if ! command -v uv &>/dev/null; then echo "'uv' is not installed. Installing 'uv'..." curl -LsSf https://astral.sh/uv/install.sh | sh