version unification for docker, server and plugin

UnitTestBot · Jul 1, 2022 · 2171673 · 2171673
1 parent 6dd494f
commit 2171673
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/.github/workflows/matrix.json b/.github/workflows/matrix.json
@@ -1,7 +1,7 @@
 {
   "include": [
     {
-      "DOCKER_TAG": "24-03-2022",
+      "DOCKER_TAG": "2022.7.0",
       "OPERATING_SYSTEM_TAG": "18.04",
       "LLVM_VERSION_MAJOR": "10"
     }

diff --git a/.github/workflows/publish-utbot.yml b/.github/workflows/publish-utbot.yml
@@ -3,7 +3,7 @@ name: Publish UTBot as an archive
 on:
   push:
     tags:
-      - '[0-9][0-9][0-9][0-9].[0-1][0-9].[0-9]+'
+      - '[1-9][0-9][0-9][0-9].[1]?[0-9].[0-9]+'
     branches:
       - main
 
@@ -44,21 +44,25 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: recursive
-      - name: build VSCode plugin
-        run: |
-          chmod +x docker/action-scripts/build-vsix.sh
-          ./docker/action-scripts/build-vsix.sh
-      - name: build UTBot
+      - name: set version
         run: |
-          re="^[0-9]{4}\.[0-1][0-9]\.[0-9]+$"
+          re="^[1-9][0-9]{3}\.[1]?[0-9]\.[1-9][0-9]*$"
           if [[ $GITHUB_REF_NAME =~ $re ]]; then 
             export VERSION=$GITHUB_REF_NAME
             echo "ARTIFACT_NAME=release-$VERSION" >> $GITHUB_ENV
           else
-            export VERSION=$(date '+%Y.%m').$GITHUB_RUN_NUMBER
+            export VERSION=$(date '+%Y.%-m').$GITHUB_RUN_NUMBER
             echo "ARTIFACT_NAME=dev-$VERSION" >> $GITHUB_ENV
           fi
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
           export RUN_INFO=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID
+          echo "RUN_INFO=RUN_INFO" >> $GITHUB_ENV
+      - name: build VSCode plugin
+        run: |
+          chmod +x docker/action-scripts/build-vsix.sh
+          ./docker/action-scripts/build-vsix.sh
+      - name: build UTBot
+        run: |
           chmod +x docker/action-scripts/build-utbot.sh
           ./docker/action-scripts/build-utbot.sh
         shell: bash

diff --git a/docker/building_dependencies/runtime_env.sh b/docker/building_dependencies/runtime_env.sh
@@ -34,3 +34,5 @@ export CPATH=$CPATH:$UTBOT_ALL/klee/include
 export LD_LIBRARY_PATH=$UTBOT_INSTALL_DIR/lib
 export LDFLAGS='-fuse-ld=gold'
 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
+
+export VERSION=$(date '+%Y.%-m').0
diff --git a/docker/release_distribution_scripts/utbot_run_system.sh b/docker/release_distribution_scripts/utbot_run_system.sh
@@ -117,13 +117,8 @@ then
 
   log "Starting a new server process; logs are written into [$UTBOT_LOGS_FOLDER] folder"
   start_process "$UTBOT_PROCESS_PATTERN" "$UTBOT_EXECUTABLE_PATH" "$UTBOT_SERVER_OPTIONS" "$UTBOT_STDOUT_LOG_FILE" "$UTBOT_PID_FILE"
-  repeats=0
-  while [ $repeats -le 20 ] && [ $(wc -l < $UTBOT_STDOUT_LOG_FILE) -lt 6 ]
-  do
-    sleep 0.1
-    repeats=$(( repeats + 1 ))
-  done
-  head $UTBOT_STDOUT_LOG_FILE -n 6
+  sleep 5
+  head $UTBOT_STDOUT_LOG_FILE -n 15
 fi
 
 if [ "$1" = "cli" ]

diff --git a/vscode-plugin/package.json b/vscode-plugin/package.json
@@ -4,7 +4,7 @@
 	"publisher": "UnitTestBot",
 	"repository": "https://github.com/UnitTestBot/UTBotCpp",
 	"description": "Provides instruments for auto generating regression tests in C/C++ projects.",
-	"version": "0.0.1",
+	"version": "2022.7.0",
 	"engines": {
 		"vscode": "^1.50.0"
 	},