Skip to content

Commit 55fe61c

Browse files
authored
Minor refactoring for CI scripts (model-checking#2142)
1 parent 326b35e commit 55fe61c

File tree

4 files changed

+16
-19
lines changed

4 files changed

+16
-19
lines changed

.github/actions/setup/action.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,6 @@ runs:
1616
run: ./scripts/setup/${{ inputs.os }}/install_deps.sh
1717
shell: bash
1818

19-
- name: Install CBMC
20-
run: ./scripts/setup/${{ inputs.os }}/install_cbmc.sh
21-
shell: bash
22-
if: ${{format('{0}', inputs.install_cbmc) != 'false'}}
23-
24-
- name: Install cbmc-viewer
25-
run: ./scripts/setup/${{ inputs.os }}/install_viewer.sh
26-
shell: bash
27-
28-
- name: Install Kissat
29-
run: ./scripts/setup/install_kissat.sh
30-
shell: bash
31-
3219
- name: Install Rust toolchain
3320
run: ./scripts/setup/install_rustup.sh
3421
shell: bash

docs/src/build-from-source.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ git clone https://github.com/model-checking/kani.git
2929
cd kani
3030
git submodule update --init
3131
./scripts/setup/ubuntu/install_deps.sh
32-
./scripts/setup/ubuntu/install_cbmc.sh
33-
./scripts/setup/ubuntu/install_viewer.sh
34-
./scripts/setup/install_kissat.sh
3532
# If you haven't already (or from https://rustup.rs/):
3633
./scripts/setup/install_rustup.sh
3734
source $HOME/.cargo/env
@@ -47,9 +44,6 @@ git clone https://github.com/model-checking/kani.git
4744
cd kani
4845
git submodule update --init
4946
./scripts/setup/macos/install_deps.sh
50-
./scripts/setup/macos/install_cbmc.sh
51-
./scripts/setup/macos/install_viewer.sh
52-
./scripts/setup/install_kissat.sh
5347
# If you haven't already (or from https://rustup.rs/):
5448
./scripts/setup/install_rustup.sh
5549
source $HOME/.cargo/env

scripts/setup/macos/install_deps.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,11 @@ PYTHON_DEPS=(
1818
)
1919

2020
python3 -m pip install "${PYTHON_DEPS[@]}"
21+
22+
# Get the directory containing this script
23+
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
24+
25+
${SCRIPT_DIR}/install_cbmc.sh
26+
${SCRIPT_DIR}/install_viewer.sh
27+
# The Kissat installation script is platform-independent, so is placed one level up
28+
${SCRIPT_DIR}/../install_kissat.sh

scripts/setup/ubuntu/install_deps.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,11 @@ PYTHON_DEPS=(
5252
)
5353

5454
python3 -m pip install "${PYTHON_DEPS[@]}"
55+
56+
# Get the directory containing this script
57+
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
58+
59+
${SCRIPT_DIR}/install_cbmc.sh
60+
${SCRIPT_DIR}/install_viewer.sh
61+
# The Kissat installation script is platform-independent, so is placed one level up
62+
${SCRIPT_DIR}/../install_kissat.sh

0 commit comments

Comments
 (0)