Minor refactoring for CI scripts (model-checking#2142)

celinval · Jan 23, 2023 · 55fe61c · 55fe61c
1 parent 326b35e
commit 55fe61c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -16,19 +16,6 @@ runs:
         run: ./scripts/setup/${{ inputs.os }}/install_deps.sh
         shell: bash
 
-      - name: Install CBMC
-        run: ./scripts/setup/${{ inputs.os }}/install_cbmc.sh
-        shell: bash
-        if: ${{format('{0}', inputs.install_cbmc) != 'false'}}
-
-      - name: Install cbmc-viewer
-        run: ./scripts/setup/${{ inputs.os }}/install_viewer.sh
-        shell: bash
-
-      - name: Install Kissat
-        run: ./scripts/setup/install_kissat.sh
-        shell: bash
-
       - name: Install Rust toolchain
         run: ./scripts/setup/install_rustup.sh
         shell: bash

diff --git a/docs/src/build-from-source.md b/docs/src/build-from-source.md
@@ -29,9 +29,6 @@ git clone https://github.com/model-checking/kani.git
 cd kani
 git submodule update --init
 ./scripts/setup/ubuntu/install_deps.sh
-./scripts/setup/ubuntu/install_cbmc.sh
-./scripts/setup/ubuntu/install_viewer.sh
-./scripts/setup/install_kissat.sh
 # If you haven't already (or from https://rustup.rs/):
 ./scripts/setup/install_rustup.sh
 source $HOME/.cargo/env
@@ -47,9 +44,6 @@ git clone https://github.com/model-checking/kani.git
 cd kani
 git submodule update --init
 ./scripts/setup/macos/install_deps.sh
-./scripts/setup/macos/install_cbmc.sh
-./scripts/setup/macos/install_viewer.sh
-./scripts/setup/install_kissat.sh
 # If you haven't already (or from https://rustup.rs/):
 ./scripts/setup/install_rustup.sh
 source $HOME/.cargo/env

diff --git a/scripts/setup/macos/install_deps.sh b/scripts/setup/macos/install_deps.sh
@@ -18,3 +18,11 @@ PYTHON_DEPS=(
 )
 
 python3 -m pip install "${PYTHON_DEPS[@]}"
+
+# Get the directory containing this script
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+${SCRIPT_DIR}/install_cbmc.sh
+${SCRIPT_DIR}/install_viewer.sh
+# The Kissat installation script is platform-independent, so is placed one level up
+${SCRIPT_DIR}/../install_kissat.sh
diff --git a/scripts/setup/ubuntu/install_deps.sh b/scripts/setup/ubuntu/install_deps.sh
@@ -52,3 +52,11 @@ PYTHON_DEPS=(
 )
 
 python3 -m pip install "${PYTHON_DEPS[@]}"
+
+# Get the directory containing this script
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+${SCRIPT_DIR}/install_cbmc.sh
+${SCRIPT_DIR}/install_viewer.sh
+# The Kissat installation script is platform-independent, so is placed one level up
+${SCRIPT_DIR}/../install_kissat.sh