From b7160a88f783f8816ac927764308a3b84adb92c4 Mon Sep 17 00:00:00 2001 From: Samuel Chassot Date: Fri, 6 Sep 2024 08:41:18 +0200 Subject: [PATCH 1/5] missing change dir in script --- install_stainless_and_solvers.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install_stainless_and_solvers.sh b/install_stainless_and_solvers.sh index 9e023156..2c0966b5 100755 --- a/install_stainless_and_solvers.sh +++ b/install_stainless_and_solvers.sh @@ -11,6 +11,7 @@ cd "$STAINLESS_DIR" git clone --recurse-submodules https://github.com/epfl-lara/stainless cd stainless sbt universal:stage +cd - # cvc5 wget https://github.com/cvc5/cvc5/releases/download/cvc5-1.1.2/cvc5-Linux-static.zip -O "$TEMP_DIR/downloaded.zip" -q From bdbedf3a1f681ad6b0fa64720256a785ae0ff328 Mon Sep 17 00:00:00 2001 From: Samuel Chassot Date: Fri, 6 Sep 2024 08:49:53 +0200 Subject: [PATCH 2/5] fix the install script --- .github/workflows/bolts-CI.yml | 1 + install_stainless_and_solvers.sh | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bolts-CI.yml b/.github/workflows/bolts-CI.yml index 884fbd06..331f45bd 100644 --- a/.github/workflows/bolts-CI.yml +++ b/.github/workflows/bolts-CI.yml @@ -22,6 +22,7 @@ jobs: with: distribution: temurin java-version: 17 + cache: sbt - name: Install stainless and solvers run: ./install_stainless_and_solvers.sh $GITHUB_WORKSPACE/.local/bin $GITHUB_WORKSPACE/.local - name: Add stainless to PATH diff --git a/install_stainless_and_solvers.sh b/install_stainless_and_solvers.sh index 2c0966b5..1bd1a427 100755 --- a/install_stainless_and_solvers.sh +++ b/install_stainless_and_solvers.sh @@ -6,13 +6,6 @@ mkdir -p "$SOLVERS_DIR" mkdir -p "$TEMP_DIR" mkdir -p "$STAINLESS_DIR" -# stainless -cd "$STAINLESS_DIR" -git clone --recurse-submodules https://github.com/epfl-lara/stainless -cd stainless -sbt universal:stage -cd - - # cvc5 wget https://github.com/cvc5/cvc5/releases/download/cvc5-1.1.2/cvc5-Linux-static.zip -O "$TEMP_DIR/downloaded.zip" -q unzip "$TEMP_DIR/downloaded.zip" -d "$TEMP_DIR" @@ -35,4 +28,13 @@ chmod +x "$SOLVERS_DIR/z3" rm -rf "$TEMP_DIR" echo "************** Solvers Installed **************" + +# stainless +cd "$STAINLESS_DIR" +git clone --recurse-submodules https://github.com/epfl-lara/stainless +cd stainless +sbt universal:stage +cd - + +echo "************** Stainless Installed **************" exit 0 \ No newline at end of file From 970b6cfa8dd108f9b63a875c570a57c26e24209f Mon Sep 17 00:00:00 2001 From: Samuel Chassot Date: Fri, 6 Sep 2024 08:54:15 +0200 Subject: [PATCH 3/5] fix script --- .github/workflows/bolts-CI.yml | 2 +- install_stainless_and_solvers.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/bolts-CI.yml b/.github/workflows/bolts-CI.yml index 331f45bd..ac5531fe 100644 --- a/.github/workflows/bolts-CI.yml +++ b/.github/workflows/bolts-CI.yml @@ -24,7 +24,7 @@ jobs: java-version: 17 cache: sbt - name: Install stainless and solvers - run: ./install_stainless_and_solvers.sh $GITHUB_WORKSPACE/.local/bin $GITHUB_WORKSPACE/.local + run: ./install_stainless_and_solvers.sh $GITHUB_WORKSPACE/.local/bin $GITHUB_WORKSPACE/.local && cd $GITHUB_WORKSPACE - name: Add stainless to PATH run: echo "$GITHUB_WORKSPACE/.local/stainless/frontends/dotty/target/universal/stage/bin" >> $GITHUB_PATH - name: Test stainless availability diff --git a/install_stainless_and_solvers.sh b/install_stainless_and_solvers.sh index 1bd1a427..f9a0f861 100755 --- a/install_stainless_and_solvers.sh +++ b/install_stainless_and_solvers.sh @@ -34,7 +34,6 @@ cd "$STAINLESS_DIR" git clone --recurse-submodules https://github.com/epfl-lara/stainless cd stainless sbt universal:stage -cd - echo "************** Stainless Installed **************" exit 0 \ No newline at end of file From e250edaecb62b83a9eba1ad755e78d2285959eb5 Mon Sep 17 00:00:00 2001 From: Samuel Chassot Date: Fri, 6 Sep 2024 09:00:33 +0200 Subject: [PATCH 4/5] debugging CI --- .github/workflows/bolts-CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bolts-CI.yml b/.github/workflows/bolts-CI.yml index ac5531fe..8ddf2b54 100644 --- a/.github/workflows/bolts-CI.yml +++ b/.github/workflows/bolts-CI.yml @@ -24,7 +24,7 @@ jobs: java-version: 17 cache: sbt - name: Install stainless and solvers - run: ./install_stainless_and_solvers.sh $GITHUB_WORKSPACE/.local/bin $GITHUB_WORKSPACE/.local && cd $GITHUB_WORKSPACE + run: ./install_stainless_and_solvers.sh $GITHUB_WORKSPACE/.local/bin $GITHUB_WORKSPACE/.local - name: Add stainless to PATH run: echo "$GITHUB_WORKSPACE/.local/stainless/frontends/dotty/target/universal/stage/bin" >> $GITHUB_PATH - name: Test stainless availability @@ -34,7 +34,7 @@ jobs: - name: Test solvers availability run: cvc5 --version && z3 --version && cvc4 --version - name: Bolts Tests - run: ./run_tests.sh + run: pwd && ls -al && ./run_tests.sh fail_if_pull_request_is_draft: if: github.event.pull_request.draft == true runs-on: [self-hosted, linux] From bbd1392d1528b6e0dab065870e9bb1d229389399 Mon Sep 17 00:00:00 2001 From: Samuel Chassot Date: Fri, 6 Sep 2024 09:04:23 +0200 Subject: [PATCH 5/5] fix github actions workflow --- .github/workflows/bolts-CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bolts-CI.yml b/.github/workflows/bolts-CI.yml index 8ddf2b54..c9729f2d 100644 --- a/.github/workflows/bolts-CI.yml +++ b/.github/workflows/bolts-CI.yml @@ -34,7 +34,7 @@ jobs: - name: Test solvers availability run: cvc5 --version && z3 --version && cvc4 --version - name: Bolts Tests - run: pwd && ls -al && ./run_tests.sh + run: ./run-tests.sh fail_if_pull_request_is_draft: if: github.event.pull_request.draft == true runs-on: [self-hosted, linux]