Skip to content

Commit 2171673

Browse files
Vladislav Kaluginladisgin
authored andcommitted
version unification for docker, server and plugin
1 parent 6dd494f commit 2171673

File tree

5 files changed

+18
-17
lines changed

5 files changed

+18
-17
lines changed

.github/workflows/matrix.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"include": [
33
{
4-
"DOCKER_TAG": "24-03-2022",
4+
"DOCKER_TAG": "2022.7.0",
55
"OPERATING_SYSTEM_TAG": "18.04",
66
"LLVM_VERSION_MAJOR": "10"
77
}

.github/workflows/publish-utbot.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Publish UTBot as an archive
33
on:
44
push:
55
tags:
6-
- '[0-9][0-9][0-9][0-9].[0-1][0-9].[0-9]+'
6+
- '[1-9][0-9][0-9][0-9].[1]?[0-9].[0-9]+'
77
branches:
88
- main
99

@@ -44,21 +44,25 @@ jobs:
4444
uses: actions/checkout@v2
4545
with:
4646
submodules: recursive
47-
- name: build VSCode plugin
48-
run: |
49-
chmod +x docker/action-scripts/build-vsix.sh
50-
./docker/action-scripts/build-vsix.sh
51-
- name: build UTBot
47+
- name: set version
5248
run: |
53-
re="^[0-9]{4}\.[0-1][0-9]\.[0-9]+$"
49+
re="^[1-9][0-9]{3}\.[1]?[0-9]\.[1-9][0-9]*$"
5450
if [[ $GITHUB_REF_NAME =~ $re ]]; then
5551
export VERSION=$GITHUB_REF_NAME
5652
echo "ARTIFACT_NAME=release-$VERSION" >> $GITHUB_ENV
5753
else
58-
export VERSION=$(date '+%Y.%m').$GITHUB_RUN_NUMBER
54+
export VERSION=$(date '+%Y.%-m').$GITHUB_RUN_NUMBER
5955
echo "ARTIFACT_NAME=dev-$VERSION" >> $GITHUB_ENV
6056
fi
57+
echo "VERSION=$VERSION" >> $GITHUB_ENV
6158
export RUN_INFO=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID
59+
echo "RUN_INFO=RUN_INFO" >> $GITHUB_ENV
60+
- name: build VSCode plugin
61+
run: |
62+
chmod +x docker/action-scripts/build-vsix.sh
63+
./docker/action-scripts/build-vsix.sh
64+
- name: build UTBot
65+
run: |
6266
chmod +x docker/action-scripts/build-utbot.sh
6367
./docker/action-scripts/build-utbot.sh
6468
shell: bash

docker/building_dependencies/runtime_env.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,5 @@ export CPATH=$CPATH:$UTBOT_ALL/klee/include
3434
export LD_LIBRARY_PATH=$UTBOT_INSTALL_DIR/lib
3535
export LDFLAGS='-fuse-ld=gold'
3636
export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$UTBOT_ALL/bear/bin:$UTBOT_ALL/klee/bin:$UTBOT_INSTALL_DIR/bin
37+
38+
export VERSION=$(date '+%Y.%-m').0

docker/release_distribution_scripts/utbot_run_system.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,8 @@ then
117117

118118
log "Starting a new server process; logs are written into [$UTBOT_LOGS_FOLDER] folder"
119119
start_process "$UTBOT_PROCESS_PATTERN" "$UTBOT_EXECUTABLE_PATH" "$UTBOT_SERVER_OPTIONS" "$UTBOT_STDOUT_LOG_FILE" "$UTBOT_PID_FILE"
120-
repeats=0
121-
while [ $repeats -le 20 ] && [ $(wc -l < $UTBOT_STDOUT_LOG_FILE) -lt 6 ]
122-
do
123-
sleep 0.1
124-
repeats=$(( repeats + 1 ))
125-
done
126-
head $UTBOT_STDOUT_LOG_FILE -n 6
120+
sleep 5
121+
head $UTBOT_STDOUT_LOG_FILE -n 15
127122
fi
128123

129124
if [ "$1" = "cli" ]

vscode-plugin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"publisher": "UnitTestBot",
55
"repository": "https://github.com/UnitTestBot/UTBotCpp",
66
"description": "Provides instruments for auto generating regression tests in C/C++ projects.",
7-
"version": "0.0.1",
7+
"version": "2022.7.0",
88
"engines": {
99
"vscode": "^1.50.0"
1010
},

0 commit comments

Comments
 (0)