diff --git a/.github/workflows/build-utbot.yml b/.github/workflows/build-utbot.yml
index f79bdf9f3..def142c7c 100644
--- a/.github/workflows/build-utbot.yml
+++ b/.github/workflows/build-utbot.yml
@@ -94,6 +94,11 @@ jobs:
./docker/action-scripts/build-vsix.sh
chmod +x docker/action-scripts/integration-tests.sh
./docker/action-scripts/integration-tests.sh
+ - name: Setup Java for building CLion plugin
+ uses: actions/setup-java@v3
+ with:
+ distribution: zulu
+ java-version: 11
- name: Run CLion integration tests
run: |
chmod +x docker/action-scripts/runClionIntegrationTests.sh
diff --git a/.github/workflows/publish-utbot.yml b/.github/workflows/publish-utbot.yml
index 54be04a68..c5cec1d16 100644
--- a/.github/workflows/publish-utbot.yml
+++ b/.github/workflows/publish-utbot.yml
@@ -65,6 +65,15 @@ jobs:
run: |
chmod +x docker/action-scripts/build-vsix.sh
./docker/action-scripts/build-vsix.sh
+ - name: Setup Java for building CLion plugin
+ uses: actions/setup-java@v3
+ with:
+ distribution: zulu
+ java-version: 11
+ - name: build CLion plugin
+ run: |
+ chmod +x docker/action-scripts/build-clion-plugin.sh
+ ./docker/action-scripts/build-clion-plugin.sh
- name: build UTBot
run: |
chmod +x docker/action-scripts/build-utbot.sh
diff --git a/clion-plugin/build.gradle.kts b/clion-plugin/build.gradle.kts
index 65f22c944..86c39722c 100644
--- a/clion-plugin/build.gradle.kts
+++ b/clion-plugin/build.gradle.kts
@@ -15,6 +15,8 @@ val grpcKotlinVersion by extra("1.1.0")
val platformType: String by project
val platformVersion: String by project
+val pluginVersion: String by extra(System.getenv("VERSION") ?: properties("pluginVersion"))
+
buildscript {
val protobufPlugInVersion by extra("0.8.17")
val kotlinVersion by extra("1.5.30")
@@ -125,7 +127,7 @@ idea {
}
group = properties("pluginGroup")
-version = properties("pluginVersion")
+version = pluginVersion
// Configure project's dependencies
repositories {
@@ -206,7 +208,8 @@ tasks {
}
patchPluginXml {
- version.set(properties("pluginVersion"))
+ println("plugin version $pluginVersion")
+ version.set(pluginVersion)
sinceBuild.set(properties("pluginSinceBuild"))
untilBuild.set(properties("pluginUntilBuild"))
diff --git a/clion-plugin/gradle.properties b/clion-plugin/gradle.properties
index 755e0cdc5..5ce361d7a 100644
--- a/clion-plugin/gradle.properties
+++ b/clion-plugin/gradle.properties
@@ -3,6 +3,9 @@
pluginGroup = org.utbot.cpp.clion.plugin
pluginName = UTBotCppClion
+
+# development version. For releases version is taken during build from enviroment variable VERSION
+# see publish_utbot.yaml and patchPluginXml task in build.gradle.kts
pluginVersion = 0.0.1
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
diff --git a/clion-plugin/src/main/resources/META-INF/plugin.xml b/clion-plugin/src/main/resources/META-INF/plugin.xml
index 1440f3113..10f934526 100644
--- a/clion-plugin/src/main/resources/META-INF/plugin.xml
+++ b/clion-plugin/src/main/resources/META-INF/plugin.xml
@@ -3,7 +3,6 @@
org.utbot.cpp.clion.plugin
UTBotCppClion
vol0n
- 0.0.1
com.intellij.modules.platform
com.intellij.modules.clion.ide
@@ -17,7 +16,6 @@
implementationClass="org.utbot.cpp.clion.plugin.ui.testsResults.UTBotTestRunLineMarkerProvider"/>
-
$ARTIFACT_DIR/version.txt
mv vscode-plugin/*.vsix $ARTIFACT_DIR/utbot_plugin.vsix
+mv clion-plugin/build/distributions/*.zip $ARTIFACT_DIR/clion_plugin.zip
mv docker/unpack_and_run_utbot.sh $ARTIFACT_DIR/unpack_and_run_utbot.sh
cd $ARTIFACT_DIR
diff --git a/docker/action-scripts/runClionIntegrationTests.sh b/docker/action-scripts/runClionIntegrationTests.sh
index 27fce00e1..5c8f27b65 100644
--- a/docker/action-scripts/runClionIntegrationTests.sh
+++ b/docker/action-scripts/runClionIntegrationTests.sh
@@ -8,16 +8,6 @@ sudo apt-get update -y
# install font config. Without it java.awt will throw, and ide will exit.
apt-get install libfreetype6 fontconfig fonts-dejavu -y
-#install java zulu 11 distribution
-sudo apt update -y
-sudo apt install dirmngr --install-recommends -y
-sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9
-sudo apt-add-repository 'deb http://repos.azulsystems.com/ubuntu stable main' -y
-
-sudo apt update -y
-sudo apt install zulu-11 -y
-
-
set -e
./server/build/utbot server > /dev/null 2>&1 &