Skip to content

Commit aa06443

Browse files
authored
Merge pull request #814 from scalecube/fixing-ci
Fixing ci
2 parents b318b7a + 4dfad4f commit aa06443

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

.github/workflows/branch-ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,6 @@ jobs:
3333
env:
3434
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
3535
- name: Maven Verify
36-
run: mvn verify -B
36+
run: |
37+
sudo echo "127.0.0.1 $(eval hostname)" | sudo tee -a /etc/hosts
38+
mvn verify -B

.github/workflows/pre-release-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
server-password: GITHUB_TOKEN
2626
- name: Deploy pre-release version to GitHub Packages
2727
run: |
28+
sudo echo "127.0.0.1 $(eval hostname)" | sudo tee -a /etc/hosts
2829
pre_release_version=${{ github.event.release.tag_name }}
2930
echo Pre-release version $pre_release_version
3031
mvn versions:set -DnewVersion=$pre_release_version -DgenerateBackupPoms=false

.github/workflows/release-ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ jobs:
3131
env:
3232
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
3333
- name: Maven Verify
34-
run: mvn verify -B
34+
run: |
35+
sudo echo "127.0.0.1 $(eval hostname)" | sudo tee -a /etc/hosts
36+
mvn verify -B
3537
- name: Configure git
3638
run: |
3739
git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com"

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,18 @@
5757
</scm>
5858

5959
<properties>
60-
<scalecube-cluster.version>2.6.8</scalecube-cluster.version>
60+
<scalecube-cluster.version>2.6.9</scalecube-cluster.version>
6161
<scalecube-commons.version>1.0.13</scalecube-commons.version>
6262
<scalecube-security.version>1.0.19</scalecube-security.version>
6363

64-
<reactor.version>2020.0.5</reactor.version>
64+
<reactor.version>2020.0.6</reactor.version>
6565
<jackson.version>2.11.0</jackson.version>
6666
<rsocket.version>1.0.4</rsocket.version>
6767
<protostuff.version>1.6.0</protostuff.version>
6868
<slf4j.version>1.7.30</slf4j.version>
6969
<log4j.version>2.13.2</log4j.version>
7070
<disruptor.version>3.4.2</disruptor.version>
71-
<netty.version>4.1.60.Final</netty.version>
71+
<netty.version>4.1.63.Final</netty.version>
7272
<snakeyaml.version>1.26</snakeyaml.version>
7373

7474
<jsr305.version>3.0.2</jsr305.version>

services/src/main/java/io/scalecube/services/Microservices.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,7 @@ public Mono<Void> shutdown() {
674674
return Mono.defer(
675675
() -> {
676676
disposables.dispose();
677+
sink.emitComplete(RetryEmitFailureHandler.INSTANCE);
677678
return Mono.whenDelayError(
678679
discoveryInstances.values().stream()
679680
.map(ServiceDiscovery::shutdown)

0 commit comments

Comments
 (0)