You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by al...@apache.org on 2022/08/29 05:32:56 UTC
[dubbo-samples] branch master updated: Fix compiler version not pass from actions (#506)
This is an automated email from the ASF dual-hosted git repository.
albumenj 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 2b8bcc82 Fix compiler version not pass from actions (#506)
2b8bcc82 is described below
commit 2b8bcc82d7c8db6c6356b5627e70af318e5d61cd
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Mon Aug 29 13:32:51 2022 +0800
Fix compiler version not pass from actions (#506)
* Fix compiler version not pass from actions
* fix zk address
---
.github/workflows/dubbo-3.yml | 2 +-
.github/workflows/nightly-dubbo-3.yml | 2 +-
.../apache/dubbo/samples/triple/reactor/ReactorConsumer.java | 4 +++-
.../apache/dubbo/samples/triple/reactor/ReactorServerTest.java | 10 ++++++----
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/dubbo-3.yml b/.github/workflows/dubbo-3.yml
index d7f17251..7b589fbf 100644
--- a/.github/workflows/dubbo-3.yml
+++ b/.github/workflows/dubbo-3.yml
@@ -155,7 +155,7 @@ jobs:
- name: Init Candidate Versions
run: |
DUBBO_VERSION="${{needs.build-dubbo.outputs.version}}"
- CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;$CANDIDATE_VERSIONS"
+ CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;compiler.version:$DUBBO_VERSION;dubbo.compiler.version:$DUBBO_VERSION;$CANDIDATE_VERSIONS"
echo "CANDIDATE_VERSIONS=$CANDIDATE_VERSIONS" >> $GITHUB_ENV
- name: Build test image
run: |
diff --git a/.github/workflows/nightly-dubbo-3.yml b/.github/workflows/nightly-dubbo-3.yml
index e62862f7..25f5c05b 100644
--- a/.github/workflows/nightly-dubbo-3.yml
+++ b/.github/workflows/nightly-dubbo-3.yml
@@ -158,7 +158,7 @@ jobs:
- name: Init Candidate Versions
run: |
DUBBO_VERSION="${{needs.build-dubbo.outputs.version}}"
- CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;$CANDIDATE_VERSIONS"
+ CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;compiler.version:$DUBBO_VERSION;dubbo.compiler.version:$DUBBO_VERSION;$CANDIDATE_VERSIONS"
echo "CANDIDATE_VERSIONS=$CANDIDATE_VERSIONS" >> $GITHUB_ENV
- name: Build test image
run: |
diff --git a/dubbo-samples-triple-reactor/src/main/java/org/apache/dubbo/samples/triple/reactor/ReactorConsumer.java b/dubbo-samples-triple-reactor/src/main/java/org/apache/dubbo/samples/triple/reactor/ReactorConsumer.java
index e9bd3ddf..cf0c4009 100644
--- a/dubbo-samples-triple-reactor/src/main/java/org/apache/dubbo/samples/triple/reactor/ReactorConsumer.java
+++ b/dubbo-samples-triple-reactor/src/main/java/org/apache/dubbo/samples/triple/reactor/ReactorConsumer.java
@@ -22,6 +22,7 @@ import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import reactor.core.publisher.Flux;
@@ -44,7 +45,8 @@ public class ReactorConsumer {
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
bootstrap.application(new ApplicationConfig("tri-reactor-stub-server"))
- .registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
+ .registry(new RegistryConfig("zookeeper://" + System.getProperty("zookeeper.address", "127.0.0.1") + ":" +
+ System.getProperty("zookeeper.port", "2181")))
.reference(referenceConfig)
.start();
diff --git a/dubbo-samples-triple-reactor/src/test/java/org/apache/dubbo/samples/triple/reactor/ReactorServerTest.java b/dubbo-samples-triple-reactor/src/test/java/org/apache/dubbo/samples/triple/reactor/ReactorServerTest.java
index f15421af..54487283 100644
--- a/dubbo-samples-triple-reactor/src/test/java/org/apache/dubbo/samples/triple/reactor/ReactorServerTest.java
+++ b/dubbo-samples-triple-reactor/src/test/java/org/apache/dubbo/samples/triple/reactor/ReactorServerTest.java
@@ -22,6 +22,7 @@ import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
+
import org.junit.BeforeClass;
import org.junit.Test;
import reactor.core.publisher.Flux;
@@ -44,7 +45,8 @@ public class ReactorServerTest {
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
bootstrap.application(new ApplicationConfig("tri-reactor-stub-server"))
- .registry(new RegistryConfig("zookeeper://${zookeeper.address:127.0.0.1}:${zookeeper.port:2181}"))
+ .registry(new RegistryConfig("zookeeper://" + System.getProperty("zookeeper.address", "127.0.0.1") + ":" +
+ System.getProperty("zookeeper.port", "2181")))
.reference(referenceConfig)
.start();
@@ -62,7 +64,7 @@ public class ReactorServerTest {
@Test
public void consumeOneToMany() {
StepVerifier.create(greeterService.greetOneToMany(
- Mono.just(GreeterRequest.newBuilder().setName("1,2,3,4,5,6,7,8,9,10").build())))
+ Mono.just(GreeterRequest.newBuilder().setName("1,2,3,4,5,6,7,8,9,10").build())))
.expectNextCount(10)
.expectComplete()
.log()
@@ -72,7 +74,7 @@ public class ReactorServerTest {
@Test
public void consumeManyToOne() {
StepVerifier.create(greeterService.greetManyToOne(
- Flux.range(1, 10).map(num -> GreeterRequest.newBuilder().setName(String.valueOf(num)).build())))
+ Flux.range(1, 10).map(num -> GreeterRequest.newBuilder().setName(String.valueOf(num)).build())))
.expectNext(GreeterReply.newBuilder().setMessage("55").build())
.expectComplete()
.verify(Duration.ofSeconds(3));
@@ -81,7 +83,7 @@ public class ReactorServerTest {
@Test
public void consumeManyToMany() {
StepVerifier.create(greeterService.greetManyToMany(Flux.range(1, 10)
- .map(num -> GreeterRequest.newBuilder().setName(String.valueOf(num)).build())))
+ .map(num -> GreeterRequest.newBuilder().setName(String.valueOf(num)).build())))
.expectNext(GreeterReply.newBuilder().setMessage("1 -> server get").build())
.expectNextCount(9)
.expectComplete()
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org