Skip to content

Commit 06b689e

Browse files
Vladislav Kaluginladisgin
authored andcommitted
Unify server and vscode plugin version
1 parent 3a8dc2c commit 06b689e

File tree

4 files changed

+25
-21
lines changed

4 files changed

+25
-21
lines changed

.github/workflows/build-utbot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
submodules: recursive
4545
- name: Build UTBot
4646
run: |
47-
export PROJECT_VERSION=$(date '+%Y.%m').$GITHUB_RUN_NUMBER
47+
export VERSION=$(date '+%Y.%m').$GITHUB_RUN_NUMBER
4848
export RUN_INFO=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID
4949
echo $RUN_INFO
5050
chmod +x docker/action-scripts/build-utbot.sh
@@ -84,7 +84,7 @@ jobs:
8484

8585
- name: build UTBot
8686
run: |
87-
export PROJECT_VERSION=$(date '+%Y.%m').$GITHUB_RUN_NUMBER
87+
export VERSION=$(date '+%Y.%m').$GITHUB_RUN_NUMBER
8888
export RUN_INFO=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID
8989
chmod +x docker/action-scripts/build-utbot.sh
9090
./docker/action-scripts/build-utbot.sh

.github/workflows/publish-utbot.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
tags:
66
- '[0-9][0-9][0-9][0-9].[0-1][0-9].[0-9]+'
7-
- '[0-9][0-9][0-9][0-9].[0-1][0-9]'
87
branches:
98
- main
109

@@ -28,9 +27,6 @@ jobs:
2827
matrix: ${{ fromJson(needs.matrix-prep.outputs.matrix) }}
2928
runs-on: ubuntu-${{ matrix.OPERATING_SYSTEM_TAG }}
3029
env:
31-
# Environment for the job and for the container is, sadly, duplicated
32-
# https://github.com/docker/compose/issues/1837
33-
VERSION: ${{ format('1.0.{0}', github.run_number) }}
3430
ARTIFACT_DIR: utbot-artifact
3531
container:
3632
image: ghcr.io/unittestbot/utbotcpp/base_env:${{ matrix.DOCKER_TAG }}
@@ -54,13 +50,13 @@ jobs:
5450
./docker/action-scripts/build-vsix.sh
5551
- name: build UTBot
5652
run: |
57-
re="^[0-9]{4}\.[0-1][0-9](\.[0-9]+){0,1}$"
53+
re="^[0-9]{4}\.[0-1][0-9]\.[0-9]+$"
5854
if [[ $GITHUB_REF_NAME =~ $re ]]; then
59-
export PROJECT_VERSION=$GITHUB_REF_NAME
60-
echo "ARTIFACT_NAME=release-$PROJECT_VERSION" >> $GITHUB_ENV
55+
export VERSION=$GITHUB_REF_NAME
56+
echo "ARTIFACT_NAME=release-$VERSION" >> $GITHUB_ENV
6157
else
62-
export PROJECT_VERSION=$(date '+%Y.%m').$GITHUB_RUN_NUMBER
63-
echo "ARTIFACT_NAME=dev-$PROJECT_VERSION" >> $GITHUB_ENV
58+
export VERSION=$(date '+%Y.%m').$GITHUB_RUN_NUMBER
59+
echo "ARTIFACT_NAME=dev-$VERSION" >> $GITHUB_ENV
6460
fi
6561
export RUN_INFO=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID
6662
chmod +x docker/action-scripts/build-utbot.sh

server/CMakeLists.txt

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
cmake_minimum_required(VERSION 3.12)
22

3+
if (NOT DEFINED VERSION)
4+
if (DEFINED ENV{VERSION})
5+
set(VERSION $ENV{VERSION})
6+
else ()
7+
set(VERSION "0.0.1")
8+
endif ()
9+
endif ()
10+
11+
if (NOT DEFINED RUN_INFO)
12+
if (DEFINED ENV{RUN_INFO})
13+
set(RUN_INFO $ENV{RUN_INFO})
14+
else ()
15+
set(RUN_INFO "local")
16+
endif ()
17+
endif ()
18+
319
project(UTBotCpp DESCRIPTION "Tool that generates unit test by C/C++ source code, trying to reach all branches and maximize code coverage"
4-
HOMEPAGE_URL "https://unittestbot.org" VERSION ${PROJECT_VERSION})
20+
HOMEPAGE_URL "https://unittestbot.org" VERSION ${VERSION})
521
set(PROJECT_ORG "UnitTestBot")
622

723
message("Project: ${PROJECT_NAME}")

server/build.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33
mkdir -p build
44
cd build
55

6-
if [ -z $PROJECT_VERSION ]; then
7-
PROJECT_VERSION="0.0.0"
8-
fi
9-
10-
if [ -z $RUN_INFO ]; then
11-
RUN_INFO="local"
12-
fi
13-
14-
$UTBOT_CMAKE_BINARY -G "Ninja" -DCMAKE_INSTALL_PREFIX=$UTBOT_ALL/server-install -DPROJECT_VERSION=$PROJECT_VERSION -DRUN_INFO=$RUN_INFO ..
6+
$UTBOT_CMAKE_BINARY -G "Ninja" -DCMAKE_INSTALL_PREFIX=$UTBOT_ALL/server-install ..
157
$UTBOT_CMAKE_BINARY --build .
168
$UTBOT_CMAKE_BINARY --install .

0 commit comments

Comments
 (0)