Skip to content

Commit 69d5718

Browse files
committed
assembleUp
1 parent 61f3fbf commit 69d5718

File tree

3 files changed

+32
-3
lines changed

3 files changed

+32
-3
lines changed

.github/workflows/e2e.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525
- run: |
2626
PROBE_VERSION="$(python setup.py --version)"
2727
echo "SPP_PROBE_VERSION=$PROBE_VERSION" >> $GITHUB_ENV
28-
- run: python setup.py sdist
29-
- run: cp dist/sourceplusplus-${{ env.SPP_PROBE_VERSION }}.tar.gz e2e
30-
- run: cd e2e && docker-compose up -d
28+
29+
- run: ./gradlew assembleUp
30+
3131
- name: Docker IPs
3232
run: docker inspect --format='{{.Name}} - {{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -aq)
3333
- name: Set E2E_APP_HOST

build.gradle.kts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,32 @@
11
plugins {
22
id("ru.vyarus.use-python") version "2.3.0"
3+
id("com.avast.gradle.docker-compose")
34
}
45

56
python {
67
pip("apache-skywalking:0.7.0")
78
pip("vertx-eventbus-client:1.0.0")
89
}
10+
11+
tasks {
12+
register<Exec>("buildDist") {
13+
commandLine("sh", "-c", "python setup.py sdist")
14+
}
15+
16+
register<Copy>("updateDockerFiles") {
17+
dependsOn("buildDist")
18+
from("dist/")
19+
into("e2e/")
20+
}
21+
22+
register("assembleUp") {
23+
dependsOn("updateDockerFiles", "composeUp")
24+
}
25+
getByName("composeUp").mustRunAfter("updateDockerFiles")
26+
}
27+
28+
dockerCompose {
29+
dockerComposeWorkingDirectory.set(File("./e2e"))
30+
removeVolumes.set(true)
31+
waitForTcpPorts.set(false)
32+
}

settings.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pluginManagement {
2+
plugins {
3+
id 'com.avast.gradle.docker-compose' version "0.14.9" apply false
4+
}
5+
}

0 commit comments

Comments
 (0)