You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by hy...@apache.org on 2019/12/29 11:49:20 UTC
[dubbo-samples] branch master updated: add support for release
verify in ci (#137)
This is an automated email from the ASF dual-hosted git repository.
hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 5f92376 add support for release verify in ci (#137)
5f92376 is described below
commit 5f923760626d4aac3fd5cf2599154cd47a93da61
Author: Huang YunKun <ht...@gmail.com>
AuthorDate: Sun Dec 29 19:49:10 2019 +0800
add support for release verify in ci (#137)
---
.travis.yml | 5 +++--
.travis/prepare-artifact.sh | 16 ++++++++++++++++
java/dubbo-samples-cloud-native/pom.xml | 3 ++-
java/dubbo-samples-protobuf/pom.xml | 3 ++-
java/dubbo-samples-tengine/pom.xml | 5 +++--
5 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8b2ef53..5efadc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,12 +16,13 @@ cache:
install: true
before_script:
+ - . .travis/prepare-artifact.sh
- cd java
script:
- - ./mvnw -U --batch-mode --no-transfer-progress --settings .mvn/settings.xml clean install -pl dubbo-maven-address-plugin -Ddubbo.version=2.7.5-SNAPSHOT
+ - ./mvnw -U --batch-mode --no-transfer-progress --settings .mvn/settings.xml clean install -pl dubbo-maven-address-plugin -Ddubbo.version=${INTERGARTION_TEST_VERSION}
- while sleep 8m; do echo "=====[ $SECONDS seconds, buildroot still building... ]====="; done &
- - travis_wait 30 ./mvnw -U --batch-mode --no-transfer-progress --settings .mvn/settings.xml clean verify -Pdubbo-integration-test -Djava-image.name=${JAVA_BASE_IMAGE} -Ddubbo.version=2.7.5-SNAPSHOT -Ddocker.showLogs > output.log
+ - travis_wait 30 ./mvnw -U --batch-mode --no-transfer-progress --settings .mvn/settings.xml clean verify -Pdubbo-integration-test -Djava-image.name=${JAVA_BASE_IMAGE} -Ddubbo.version=${INTERGARTION_TEST_VERSION} -Ddocker.showLogs > output.log
after_failure:
- tail -n 5000 output.log
diff --git a/.travis/prepare-artifact.sh b/.travis/prepare-artifact.sh
new file mode 100644
index 0000000..cb1e179
--- /dev/null
+++ b/.travis/prepare-artifact.sh
@@ -0,0 +1,16 @@
+#! /usr/bin/env bash
+env
+
+if [[ -z "${RELEASE_BRANCH}" ]]; then
+ export INTERGARTION_TEST_VERSION=2.7.6-SNAPSHOT
+else
+ git clone https://github.com/apache/dubbo.git
+ cd dubbo
+ git checkout ${RELEASE_BRANCH}
+ ls
+ ./mvnw clean install -DskipTests -Drevision=${RELEASE_BRANCH}
+ export INTERGARTION_TEST_VERSION=${RELEASE_BRANCH}
+ cd ..
+fi
+
+env|grep INTERGARTION_TEST_VERSION
\ No newline at end of file
diff --git a/java/dubbo-samples-cloud-native/pom.xml b/java/dubbo-samples-cloud-native/pom.xml
index 7aba306..4abeb06 100644
--- a/java/dubbo-samples-cloud-native/pom.xml
+++ b/java/dubbo-samples-cloud-native/pom.xml
@@ -29,6 +29,7 @@
<target.level>1.8</target.level>
<skip_maven_deploy>true</skip_maven_deploy>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+ <dubbo.version>2.7.5-SNAPSHOT</dubbo.version>
</properties>
<modules>
@@ -45,7 +46,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-bom</artifactId>
- <version>2.7.5-SNAPSHOT</version>
+ <version>${dubbo.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/java/dubbo-samples-protobuf/pom.xml b/java/dubbo-samples-protobuf/pom.xml
index 92fef0e..8729441 100644
--- a/java/dubbo-samples-protobuf/pom.xml
+++ b/java/dubbo-samples-protobuf/pom.xml
@@ -31,6 +31,7 @@
<proto_dubbo_plugin_version>1.19.0-SNAPSHOT</proto_dubbo_plugin_version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<dubbo.compiler.version>0.0.1-SNAPSHOT</dubbo.compiler.version>
+ <dubbo.version>2.7.5-SNAPSHOT</dubbo.version>
</properties>
<modules>
@@ -43,7 +44,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-bom</artifactId>
- <version>2.7.5-SNAPSHOT</version>
+ <version>${dubbo.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/java/dubbo-samples-tengine/pom.xml b/java/dubbo-samples-tengine/pom.xml
index a813296..52ad669 100644
--- a/java/dubbo-samples-tengine/pom.xml
+++ b/java/dubbo-samples-tengine/pom.xml
@@ -8,6 +8,7 @@
<description>The demo module of tengine dubbo</description>
<properties>
<skip_maven_deploy>true</skip_maven_deploy>
+ <dubbo.version>2.7.5-SNAPSHOT</dubbo.version>
</properties>
<modules>
<module>dubbo-samples-tengine-interface</module>
@@ -27,14 +28,14 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-dependencies-bom</artifactId>
- <version>2.7.5-SNAPSHOT</version>
+ <version>${dubbo.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
- <version>2.7.5-SNAPSHOT</version>
+ <version>${dubbo.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org