From 94633f1ce8ddecb8bc43256baf7e8bf32c31ce29 Mon Sep 17 00:00:00 2001 From: Vladislav Kalugin Date: Tue, 5 Sep 2023 15:06:42 +0300 Subject: [PATCH 1/2] Remove build folder --- docker/action-scripts/build-utbot.sh | 2 ++ vscode-plugin/src/test/run.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/action-scripts/build-utbot.sh b/docker/action-scripts/build-utbot.sh index 039f6ded8..522caa804 100644 --- a/docker/action-scripts/build-utbot.sh +++ b/docker/action-scripts/build-utbot.sh @@ -3,3 +3,5 @@ source docker/building_dependencies/runtime_env.sh chmod +x build.sh ./build.sh +rm -rf submodules/klee/build +rm -rf server/build diff --git a/vscode-plugin/src/test/run.sh b/vscode-plugin/src/test/run.sh index 9e76ff17c..bc755b003 100644 --- a/vscode-plugin/src/test/run.sh +++ b/vscode-plugin/src/test/run.sh @@ -14,7 +14,7 @@ echo "VSCODE_VERSION_DIR=$VSCODE_VERSION_DIR" export DISPLAY=':99.0' Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & -$PROJECT_DIR/server/build/utbot server > /dev/null 2>&1 & +$UTBOT_ALL/server-install/utbot server > /dev/null 2>&1 & #Executing the test suite #TODO: fetch workspace folders automatically from .vscode/launch.json From 2bf7c53c44d356718a7101b87c49db3cf098238c Mon Sep 17 00:00:00 2001 From: Vladislav Kalugin Date: Tue, 5 Sep 2023 17:46:15 +0300 Subject: [PATCH 2/2] Remove build folder --- .github/workflows/build-utbot.yml | 8 ++++---- .github/workflows/publish-utbot.yml | 4 ++-- docker/action-scripts/build-clean-utbot.sh | 7 +++++++ docker/action-scripts/build-utbot.sh | 2 -- 4 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 docker/action-scripts/build-clean-utbot.sh diff --git a/.github/workflows/build-utbot.yml b/.github/workflows/build-utbot.yml index a6bf15997..88d4c6bb8 100644 --- a/.github/workflows/build-utbot.yml +++ b/.github/workflows/build-utbot.yml @@ -86,8 +86,8 @@ jobs: run: | export VERSION=$(date '+%Y.%m').$GITHUB_RUN_NUMBER export RUN_INFO=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID - chmod +x docker/action-scripts/build-utbot.sh - ./docker/action-scripts/build-utbot.sh + chmod +x docker/action-scripts/build-clean-utbot.sh + ./docker/action-scripts/build-clean-utbot.sh - name: Run Integration Tests run: | chmod +x docker/action-scripts/build-vsix.sh @@ -137,8 +137,8 @@ jobs: - name: Build UTBot run: | - chmod +x docker/action-scripts/build-utbot.sh - ./docker/action-scripts/build-utbot.sh + chmod +x docker/action-scripts/build-clean-utbot.sh + ./docker/action-scripts/build-clean-utbot.sh - name: Generate tests run: | diff --git a/.github/workflows/publish-utbot.yml b/.github/workflows/publish-utbot.yml index 6752487cb..dfb81ae3b 100644 --- a/.github/workflows/publish-utbot.yml +++ b/.github/workflows/publish-utbot.yml @@ -77,8 +77,8 @@ jobs: ./docker/action-scripts/build-clion-plugin.sh - name: build UTBot run: | - chmod +x docker/action-scripts/build-utbot.sh - ./docker/action-scripts/build-utbot.sh + chmod +x docker/action-scripts/build-clean-utbot.sh + ./docker/action-scripts/build-clean-utbot.sh shell: bash - name: prepare UTBot release for Ubuntu run: | diff --git a/docker/action-scripts/build-clean-utbot.sh b/docker/action-scripts/build-clean-utbot.sh new file mode 100644 index 000000000..10cf04c48 --- /dev/null +++ b/docker/action-scripts/build-clean-utbot.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +chmod +x docker/action-scripts/build-utbot.sh +docker/action-scripts/build-utbot.sh + +rm -rf submodules/klee/build +rm -rf server/build diff --git a/docker/action-scripts/build-utbot.sh b/docker/action-scripts/build-utbot.sh index 522caa804..039f6ded8 100644 --- a/docker/action-scripts/build-utbot.sh +++ b/docker/action-scripts/build-utbot.sh @@ -3,5 +3,3 @@ source docker/building_dependencies/runtime_env.sh chmod +x build.sh ./build.sh -rm -rf submodules/klee/build -rm -rf server/build