Skip to content

add plugin artifact during publish-utbot workflow #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/build-utbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/publish-utbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions clion-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -125,7 +127,7 @@ idea {
}

group = properties("pluginGroup")
version = properties("pluginVersion")
version = pluginVersion

// Configure project's dependencies
repositories {
Expand Down Expand Up @@ -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"))

Expand Down
3 changes: 3 additions & 0 deletions clion-plugin/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions clion-plugin/src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<id>org.utbot.cpp.clion.plugin</id>
<name>UTBotCppClion</name>
<vendor>vol0n</vendor>
<version>0.0.1</version>

<depends>com.intellij.modules.platform</depends>
<depends>com.intellij.modules.clion.ide</depends>
Expand All @@ -17,7 +16,6 @@
implementationClass="org.utbot.cpp.clion.plugin.ui.testsResults.UTBotTestRunLineMarkerProvider"/>
<projectService serviceImplementation="org.utbot.cpp.clion.plugin.settings.UTBotAllProjectSettings"/>
<projectService serviceImplementation="org.utbot.cpp.clion.plugin.client.ClientManager"/>
<applicationService serviceImplementation="org.utbot.cpp.clion.plugin.settings.UTBotPluginSpecificSettings"/>
<coverageEngine implementation="org.utbot.cpp.clion.plugin.coverage.UTBotCoverageEngine"/>
<postStartupActivity implementation="org.utbot.cpp.clion.plugin.UTBotStartupActivity"/>
<projectConfigurable parentId="tools" instance="org.utbot.cpp.clion.plugin.settings.UTBotConfigurable"
Expand Down
6 changes: 6 additions & 0 deletions docker/action-scripts/build-clion-plugin.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

set -e

cd clion-plugin
./gradlew assemble
1 change: 1 addition & 0 deletions docker/action-scripts/prepare-ubuntu-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ cp -a docker/release_distribution_scripts/. $UTBOT_DISTR_FOLDER/
echo $VERSION > $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
Expand Down
10 changes: 0 additions & 10 deletions docker/action-scripts/runClionIntegrationTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &
Expand Down