Merge pull request #814 from scalecube/fixing-ci

Fixing ci
scalecube · Apr 14, 2021 · aa06443 · aa06443
2 parents b318b7a + 4dfad4f
commit aa06443
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml
@@ -33,4 +33,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
       - name: Maven Verify
-        run: mvn verify -B
+        run: |
+          sudo echo "127.0.0.1 $(eval hostname)" | sudo tee -a /etc/hosts
+          mvn verify -B
diff --git a/.github/workflows/pre-release-ci.yml b/.github/workflows/pre-release-ci.yml
@@ -25,6 +25,7 @@ jobs:
           server-password: GITHUB_TOKEN
       - name: Deploy pre-release version to GitHub Packages
         run: |
+          sudo echo "127.0.0.1 $(eval hostname)" | sudo tee -a /etc/hosts
           pre_release_version=${{ github.event.release.tag_name }}
           echo Pre-release version $pre_release_version
           mvn versions:set -DnewVersion=$pre_release_version -DgenerateBackupPoms=false

diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -31,7 +31,9 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
       - name: Maven Verify
-        run: mvn verify -B
+        run: |
+          sudo echo "127.0.0.1 $(eval hostname)" | sudo tee -a /etc/hosts
+          mvn verify -B
       - name: Configure git
         run: |
           git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com"

diff --git a/pom.xml b/pom.xml
@@ -57,18 +57,18 @@
   </scm>
 
   <properties>
-    <scalecube-cluster.version>2.6.8</scalecube-cluster.version>
+    <scalecube-cluster.version>2.6.9</scalecube-cluster.version>
     <scalecube-commons.version>1.0.13</scalecube-commons.version>
     <scalecube-security.version>1.0.19</scalecube-security.version>
 
-    <reactor.version>2020.0.5</reactor.version>
+    <reactor.version>2020.0.6</reactor.version>
     <jackson.version>2.11.0</jackson.version>
     <rsocket.version>1.0.4</rsocket.version>
     <protostuff.version>1.6.0</protostuff.version>
     <slf4j.version>1.7.30</slf4j.version>
     <log4j.version>2.13.2</log4j.version>
     <disruptor.version>3.4.2</disruptor.version>
-    <netty.version>4.1.60.Final</netty.version>
+    <netty.version>4.1.63.Final</netty.version>
     <snakeyaml.version>1.26</snakeyaml.version>
 
     <jsr305.version>3.0.2</jsr305.version>

diff --git a/services/src/main/java/io/scalecube/services/Microservices.java b/services/src/main/java/io/scalecube/services/Microservices.java
@@ -674,6 +674,7 @@ public Mono<Void> shutdown() {
       return Mono.defer(
           () -> {
             disposables.dispose();
+            sink.emitComplete(RetryEmitFailureHandler.INSTANCE);
             return Mono.whenDelayError(
                     discoveryInstances.values().stream()
                         .map(ServiceDiscovery::shutdown)