Skip to content

Commit 6a02696

Browse files
artem-vartem-v
authored
Merge pull request #803 from scalecube/develop
Updated dependencies + workflows
2 parents c758dd6 + 9ab50b4 commit 6a02696

File tree

99 files changed

+177
-1536
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+177
-1536
lines changed

‎.github/workflows/feature-ci.yml‎ renamed to ‎.github/workflows/branch-ci.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
name: Feature Branch CI
1+
name: Branch CI
22

33
on:
44
push:
55
paths-ignore:
66
- '.github/workflows/**'
7-
- 'README.md'
7+
- '*.md'
8+
- '*.txt'
89
branches-ignore:
9-
- 'master'
10-
- 'develop'
1110
- 'release*'
1211

1312
jobs:
1413
build:
15-
name: Feature Branch CI
14+
name: Branch CI
1615
runs-on: ubuntu-latest
1716
steps:
1817
- uses: actions/checkout@v2

‎.github/workflows/master-ci.yml‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Pre-release CI
2+
3+
on:
4+
release:
5+
types: [prereleased]
6+
7+
jobs:
8+
build:
9+
name: Pre-release CI
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- uses: actions/cache@v1
14+
with:
15+
path: ~/.m2/repository
16+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
17+
restore-keys: |
18+
${{ runner.os }}-maven-
19+
- name: Set up JDK 1.8
20+
uses: actions/setup-java@v1
21+
with:
22+
java-version: 1.8
23+
server-id: github
24+
server-username: GITHUB_ACTOR
25+
server-password: GITHUB_TOKEN
26+
- name: Deploy pre-release version
27+
run: |
28+
pre_release_version=${{ github.event.release.tag_name }}
29+
echo Pre-release version $pre_release_version
30+
mvn versions:set -DnewVersion=$pre_release_version -DgenerateBackupPoms=false
31+
mvn versions:commit
32+
mvn clean deploy -B -V
33+
env:
34+
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
35+
- name: Rollback pre-release (remove tag)
36+
if: failure()
37+
run: git push origin :refs/tags/${{ github.event.release.tag_name }}

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

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@ name: Release CI
22

33
on:
44
release:
5-
types: [published]
5+
types: [released]
66

77
jobs:
88
build:
99
name: Release CI
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v2
13+
with:
14+
fetch-depth: 0
15+
- run: git checkout ${{ github.event.release.target_commitish }}
1316
- uses: actions/cache@v1
1417
with:
1518
path: ~/.m2/repository
@@ -23,16 +26,35 @@ jobs:
2326
server-id: github
2427
server-username: GITHUB_ACTOR
2528
server-password: GITHUB_TOKEN
26-
- name: Deploy release version
27-
run: |
28-
# `tag` is the concatenation of `v` and a version by the tag convention.
29-
release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//")
30-
echo Release version $release_version
31-
mvn versions:set -DnewVersion=$release_version -DgenerateBackupPoms=false
32-
mvn versions:commit
33-
mvn clean deploy -B -V
29+
- name: Maven Build
30+
run: mvn clean install -DskipTests=true -Ddockerfile.skip=true -B -V
3431
env:
3532
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
36-
- name: Rollback release (remove tag)
33+
- name: Maven Verify
34+
run: mvn verify -B
35+
- name: Configure git
36+
run: |
37+
git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com"
38+
git config --global user.name "${GITHUB_ACTOR}"
39+
- name: Prepare release
40+
id: prepare_release
41+
run: |
42+
mvn -B build-helper:parse-version release:prepare \
43+
-DreleaseVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion} \
44+
-Darguments="-DskipTests=true -Ddockerfile.skip=true"
45+
echo ::set-output name=release_tag::$(git describe --tags --abbrev=0)
46+
- name: Perform release
47+
run: mvn -B release:perform -Darguments="-DskipTests=true -Ddockerfile.skip=true"
48+
env:
49+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50+
GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
51+
- name: Rollback release
3752
if: failure()
38-
run: git push origin :refs/tags/${{ github.event.release.tag_name }}
53+
run: |
54+
mvn release:rollback || echo "nothing to rollback"
55+
git push origin :refs/tags/${{ github.event.release.tag_name }}
56+
if [ ! -z "${{ steps.prepare_release.outputs.release_tag }}" ]
57+
then
58+
git tag -d ${{ steps.prepare_release.outputs.release_tag }}
59+
git push origin :refs/tags/${{ steps.prepare_release.outputs.release_tag }}
60+
fi

‎DEVELOPMENT.md‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<parent>
68
<groupId>io.scalecube</groupId>
79
<artifactId>scalecube-parent-pom</artifactId>
8-
<version>0.2.1</version>
10+
<version>0.2.17</version>
911
</parent>
1012

1113
<artifactId>scalecube-services-parent</artifactId>
@@ -65,10 +67,8 @@
6567
</scm>
6668

6769
<properties>
68-
<scalecube-cluster.version>2.6.1</scalecube-cluster.version>
69-
<scalecube-commons.version>1.0.10</scalecube-commons.version>
70-
<scalecube-benchmarks.version>1.2.2</scalecube-benchmarks.version>
71-
<scalecube-config.version>0.4.6</scalecube-config.version>
70+
<scalecube-cluster.version>2.6.2</scalecube-cluster.version>
71+
<scalecube-commons.version>1.0.11</scalecube-commons.version>
7272
<reactor.version>Dysprosium-SR9</reactor.version>
7373

7474
<jackson.version>2.11.0</jackson.version>
@@ -91,8 +91,7 @@
9191
<module>services-discovery</module>
9292
<module>services-bytebuf-codec</module>
9393
<module>services</module>
94-
<module>services-benchmarks</module>
95-
<module>services-examples-parent</module>
94+
<module>services-examples</module>
9695
</modules>
9796

9897
<dependencyManagement>
@@ -117,13 +116,6 @@
117116
<version>${scalecube-cluster.version}</version>
118117
</dependency>
119118

120-
<!-- Scalecube Config -->
121-
<dependency>
122-
<groupId>io.scalecube</groupId>
123-
<artifactId>config</artifactId>
124-
<version>${scalecube-config.version}</version>
125-
</dependency>
126-
127119
<!-- Reactor -->
128120
<dependency>
129121
<groupId>io.projectreactor</groupId>
@@ -194,18 +186,6 @@
194186
<version>${protostuff.version}</version>
195187
</dependency>
196188

197-
<!-- Scalecube benchmarks -->
198-
<dependency>
199-
<groupId>io.scalecube</groupId>
200-
<artifactId>scalecube-benchmarks-api</artifactId>
201-
<version>${scalecube-benchmarks.version}</version>
202-
</dependency>
203-
<dependency>
204-
<groupId>io.scalecube</groupId>
205-
<artifactId>scalecube-benchmarks-log4j2</artifactId>
206-
<version>${scalecube-benchmarks.version}</version>
207-
</dependency>
208-
209189
<!-- JCTools -->
210190
<dependency>
211191
<groupId>org.jctools</groupId>

‎services-api/src/test/java/io/scalecube/services/methods/ReflectTest.java‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77

88
import io.scalecube.services.CommunicationMode;
99
import io.scalecube.services.Reflect;
10+
import io.scalecube.services.api.ServiceMessage;
1011
import java.lang.reflect.Method;
1112
import java.util.Arrays;
1213
import java.util.stream.Stream;
13-
14-
import io.scalecube.services.api.ServiceMessage;
1514
import org.junit.jupiter.api.Assertions;
1615
import org.junit.jupiter.params.ParameterizedTest;
1716
import org.junit.jupiter.params.provider.Arguments;
@@ -60,29 +59,32 @@ static Stream<Arguments> argsCommunicationModeProvider() {
6059
@MethodSource("argsIsRequestTypeServiceMessage")
6160
public void testIsRequestTypeServiceMessage(String methodName, boolean expect) {
6261
// Given:
63-
Method method = Arrays.stream(ReflectTest.TestService.class.getMethods())
62+
Method method =
63+
Arrays.stream(ReflectTest.TestService.class.getMethods())
6464
.filter(meth -> meth.getName().equals(methodName))
6565
.findFirst()
6666
.get();
6767
// When:
6868
boolean actual = Reflect.isRequestTypeServiceMessage(method);
6969
// Then:
70-
Assertions.assertEquals(expect, actual,
71-
String.format("isRequestTypeServiceMessage(%s) should be %b", methodName, expect));
70+
Assertions.assertEquals(
71+
expect,
72+
actual,
73+
String.format("isRequestTypeServiceMessage(%s) should be %b", methodName, expect));
7274
}
7375

7476
static Stream<Arguments> argsIsRequestTypeServiceMessage() {
7577
return Stream.of(
76-
Arguments.of("fireAndForget", false),
77-
Arguments.of("emptyResponse", false),
78-
Arguments.of("requestResponse", false),
79-
Arguments.of("requestStream", false),
80-
Arguments.of("requestChannel", false),
81-
Arguments.of("fireAndForgetMessage", true),
82-
Arguments.of("emptyResponseMessage", true),
83-
Arguments.of("requestResponseMessage", true),
84-
Arguments.of("requestStreamMessage", true),
85-
Arguments.of("requestChannelMessage", true));
78+
Arguments.of("fireAndForget", false),
79+
Arguments.of("emptyResponse", false),
80+
Arguments.of("requestResponse", false),
81+
Arguments.of("requestStream", false),
82+
Arguments.of("requestChannel", false),
83+
Arguments.of("fireAndForgetMessage", true),
84+
Arguments.of("emptyResponseMessage", true),
85+
Arguments.of("requestResponseMessage", true),
86+
Arguments.of("requestStreamMessage", true),
87+
Arguments.of("requestChannelMessage", true));
8688
}
8789

8890
private interface TestService {
@@ -105,6 +107,5 @@ private interface TestService {
105107
Flux<ServiceMessage> requestStreamMessage(ServiceMessage sm);
106108

107109
Flux<ServiceMessage> requestChannelMessage(Flux<ServiceMessage> sm);
108-
109110
}
110111
}

0 commit comments

Comments
 (0)