Skip to content

Commit a1a2579

Browse files
Oleh DokukaOlegDokuka
Oleh Dokuka
authored and
OlegDokuka
committed
adds jcstress support
Signed-off-by: Oleh Dokuka <[email protected]>
1 parent f2238d8 commit a1a2579

File tree

8 files changed

+601
-11
lines changed

8 files changed

+601
-11
lines changed

‎.github/workflows/gradle-all.yml

+108-3
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,66 @@ on:
1010

1111
jobs:
1212
build:
13+
runs-on: ${{ matrix.os }}
14+
15+
strategy:
16+
matrix:
17+
os: [ ubuntu-latest ]
18+
jdk: [ 1.8, 11, 16 ]
19+
fail-fast: false
20+
21+
steps:
22+
- uses: actions/checkout@v2
23+
- name: Set up JDK ${{ matrix.jdk }}
24+
uses: actions/setup-java@v1
25+
with:
26+
java-version: ${{ matrix.jdk }}
27+
- name: Cache Gradle packages
28+
uses: actions/cache@v1
29+
with:
30+
path: ~/.gradle/caches
31+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
32+
restore-keys: ${{ runner.os }}-gradle
33+
- name: Grant execute permission for gradlew
34+
run: chmod +x gradlew
35+
- name: Build with Gradle
36+
run: ./gradlew clean build -x test --no-daemon
37+
38+
coretest:
39+
needs: [build]
40+
runs-on: ${{ matrix.os }}
41+
42+
strategy:
43+
matrix:
44+
os: [ ubuntu-latest ]
45+
jdk: [ 1.8, 11, 16 ]
46+
fail-fast: false
47+
48+
steps:
49+
- uses: actions/checkout@v2
50+
- name: Set up JDK ${{ matrix.jdk }}
51+
uses: actions/setup-java@v1
52+
with:
53+
java-version: ${{ matrix.jdk }}
54+
- name: Cache Gradle packages
55+
uses: actions/cache@v1
56+
with:
57+
path: ~/.gradle/caches
58+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
59+
restore-keys: ${{ runner.os }}-gradle
60+
- name: Grant execute permission for gradlew
61+
run: chmod +x gradlew
62+
- name: Build with Gradle
63+
run: ./gradlew rsocket-core:test --no-daemon
1364

65+
othertest:
66+
needs: [build]
1467
runs-on: ${{ matrix.os }}
1568

1669
strategy:
1770
matrix:
1871
os: [ ubuntu-latest ]
19-
jdk: [ 1.8, 11, 14 ]
72+
jdk: [ 1.8, 11, 16 ]
2073
fail-fast: false
2174

2275
steps:
@@ -34,10 +87,62 @@ jobs:
3487
- name: Grant execute permission for gradlew
3588
run: chmod +x gradlew
3689
- name: Build with Gradle
37-
run: ./gradlew clean build
90+
run: ./gradlew test -x :rsocket-core:test --no-daemon
91+
92+
jcstress:
93+
needs: [build]
94+
runs-on: ${{ matrix.os }}
95+
96+
strategy:
97+
matrix:
98+
os: [ ubuntu-latest ]
99+
jdk: [ 1.8, 11, 16 ]
100+
fail-fast: false
101+
102+
steps:
103+
- uses: actions/checkout@v2
104+
- name: Set up JDK ${{ matrix.jdk }}
105+
uses: actions/setup-java@v1
106+
with:
107+
java-version: ${{ matrix.jdk }}
108+
- name: Cache Gradle packages
109+
uses: actions/cache@v1
110+
with:
111+
path: ~/.gradle/caches
112+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
113+
restore-keys: ${{ runner.os }}-gradle
114+
- name: Grant execute permission for gradlew
115+
run: chmod +x gradlew
116+
- name: Build with Gradle
117+
run: ./gradlew jcstress --no-daemon
118+
119+
publish:
120+
needs: [ build, coretest, othertest, jcstress ]
121+
runs-on: ${{ matrix.os }}
122+
123+
strategy:
124+
matrix:
125+
os: [ ubuntu-latest ]
126+
jdk: [ 1.8, 11, 16 ]
127+
fail-fast: false
128+
129+
steps:
130+
- uses: actions/checkout@v2
131+
- name: Set up JDK ${{ matrix.jdk }}
132+
uses: actions/setup-java@v1
133+
with:
134+
java-version: ${{ matrix.jdk }}
135+
- name: Cache Gradle packages
136+
uses: actions/cache@v1
137+
with:
138+
path: ~/.gradle/caches
139+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
140+
restore-keys: ${{ runner.os }}-gradle
141+
- name: Grant execute permission for gradlew
142+
run: chmod +x gradlew
38143
- name: Publish Packages to Artifactory
39144
if: ${{ matrix.jdk == '1.8' }}
40-
run: ./gradlew -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PversionSuffix="-${githubRef#refs/heads/}-SNAPSHOT" -PbuildNumber="${buildNumber}" artifactoryPublish --stacktrace
145+
run: ./gradlew -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PversionSuffix="-${githubRef#refs/heads/}-SNAPSHOT" -PbuildNumber="${buildNumber}" artifactoryPublish --no-daemon --stacktrace
41146
env:
42147
bintrayUser: ${{ secrets.bintrayUser }}
43148
bintrayKey: ${{ secrets.bintrayKey }}

‎.github/workflows/gradle-main.yml

+108-3
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,66 @@ on:
1010

1111
jobs:
1212
build:
13+
runs-on: ${{ matrix.os }}
14+
15+
strategy:
16+
matrix:
17+
os: [ ubuntu-latest ]
18+
jdk: [ 1.8, 11, 16 ]
19+
fail-fast: false
20+
21+
steps:
22+
- uses: actions/checkout@v2
23+
- name: Set up JDK ${{ matrix.jdk }}
24+
uses: actions/setup-java@v1
25+
with:
26+
java-version: ${{ matrix.jdk }}
27+
- name: Cache Gradle packages
28+
uses: actions/cache@v1
29+
with:
30+
path: ~/.gradle/caches
31+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
32+
restore-keys: ${{ runner.os }}-gradle
33+
- name: Grant execute permission for gradlew
34+
run: chmod +x gradlew
35+
- name: Build with Gradle
36+
run: ./gradlew clean build -x test --no-daemon
37+
38+
coretest:
39+
needs: [build]
40+
runs-on: ${{ matrix.os }}
41+
42+
strategy:
43+
matrix:
44+
os: [ ubuntu-latest ]
45+
jdk: [ 1.8, 11, 16 ]
46+
fail-fast: false
47+
48+
steps:
49+
- uses: actions/checkout@v2
50+
- name: Set up JDK ${{ matrix.jdk }}
51+
uses: actions/setup-java@v1
52+
with:
53+
java-version: ${{ matrix.jdk }}
54+
- name: Cache Gradle packages
55+
uses: actions/cache@v1
56+
with:
57+
path: ~/.gradle/caches
58+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
59+
restore-keys: ${{ runner.os }}-gradle
60+
- name: Grant execute permission for gradlew
61+
run: chmod +x gradlew
62+
- name: Build with Gradle
63+
run: ./gradlew rsocket-core:test --no-daemon
1364

65+
othertest:
66+
needs: [build]
1467
runs-on: ${{ matrix.os }}
1568

1669
strategy:
1770
matrix:
1871
os: [ ubuntu-latest ]
19-
jdk: [ 1.8, 11, 14 ]
72+
jdk: [ 1.8, 11, 16 ]
2073
fail-fast: false
2174

2275
steps:
@@ -34,10 +87,62 @@ jobs:
3487
- name: Grant execute permission for gradlew
3588
run: chmod +x gradlew
3689
- name: Build with Gradle
37-
run: ./gradlew clean build
90+
run: ./gradlew test -x :rsocket-core:test --no-daemon
91+
92+
jcstress:
93+
needs: [build]
94+
runs-on: ${{ matrix.os }}
95+
96+
strategy:
97+
matrix:
98+
os: [ ubuntu-latest ]
99+
jdk: [ 1.8, 11, 16 ]
100+
fail-fast: false
101+
102+
steps:
103+
- uses: actions/checkout@v2
104+
- name: Set up JDK ${{ matrix.jdk }}
105+
uses: actions/setup-java@v1
106+
with:
107+
java-version: ${{ matrix.jdk }}
108+
- name: Cache Gradle packages
109+
uses: actions/cache@v1
110+
with:
111+
path: ~/.gradle/caches
112+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
113+
restore-keys: ${{ runner.os }}-gradle
114+
- name: Grant execute permission for gradlew
115+
run: chmod +x gradlew
116+
- name: Build with Gradle
117+
run: ./gradlew jcstress --no-daemon
118+
119+
publish:
120+
needs: [ build, coretest, othertest, jcstress ]
121+
runs-on: ${{ matrix.os }}
122+
123+
strategy:
124+
matrix:
125+
os: [ ubuntu-latest ]
126+
jdk: [ 1.8, 11, 16 ]
127+
fail-fast: false
128+
129+
steps:
130+
- uses: actions/checkout@v2
131+
- name: Set up JDK ${{ matrix.jdk }}
132+
uses: actions/setup-java@v1
133+
with:
134+
java-version: ${{ matrix.jdk }}
135+
- name: Cache Gradle packages
136+
uses: actions/cache@v1
137+
with:
138+
path: ~/.gradle/caches
139+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
140+
restore-keys: ${{ runner.os }}-gradle
141+
- name: Grant execute permission for gradlew
142+
run: chmod +x gradlew
38143
- name: Publish Packages to Artifactory
39144
if: ${{ matrix.jdk == '1.8' }}
40-
run: ./gradlew -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PversionSuffix="-SNAPSHOT" -PbuildNumber="${buildNumber}" artifactoryPublish --stacktrace
145+
run: ./gradlew -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PversionSuffix="-SNAPSHOT" -PbuildNumber="${buildNumber}" artifactoryPublish --no-daemon --stacktrace
41146
env:
42147
bintrayUser: ${{ secrets.bintrayUser }}
43148
bintrayKey: ${{ secrets.bintrayKey }}

‎.github/workflows/gradle-pr.yml

+82-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,93 @@ on: [pull_request]
44

55
jobs:
66
build:
7+
runs-on: ${{ matrix.os }}
8+
9+
strategy:
10+
matrix:
11+
os: [ ubuntu-latest ]
12+
jdk: [ 1.8, 11, 16 ]
13+
fail-fast: false
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Set up JDK ${{ matrix.jdk }}
18+
uses: actions/setup-java@v1
19+
with:
20+
java-version: ${{ matrix.jdk }}
21+
- name: Cache Gradle packages
22+
uses: actions/cache@v1
23+
with:
24+
path: ~/.gradle/caches
25+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
26+
restore-keys: ${{ runner.os }}-gradle
27+
- name: Grant execute permission for gradlew
28+
run: chmod +x gradlew
29+
- name: Build with Gradle
30+
run: ./gradlew clean build -x test --no-daemon
31+
32+
coretest:
33+
needs: [build]
34+
runs-on: ${{ matrix.os }}
35+
36+
strategy:
37+
matrix:
38+
os: [ ubuntu-latest ]
39+
jdk: [ 1.8, 11, 16 ]
40+
fail-fast: false
41+
42+
steps:
43+
- uses: actions/checkout@v2
44+
- name: Set up JDK ${{ matrix.jdk }}
45+
uses: actions/setup-java@v1
46+
with:
47+
java-version: ${{ matrix.jdk }}
48+
- name: Cache Gradle packages
49+
uses: actions/cache@v1
50+
with:
51+
path: ~/.gradle/caches
52+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
53+
restore-keys: ${{ runner.os }}-gradle
54+
- name: Grant execute permission for gradlew
55+
run: chmod +x gradlew
56+
- name: Build with Gradle
57+
run: ./gradlew rsocket-core:test --no-daemon
58+
59+
othertest:
60+
needs: [build]
61+
runs-on: ${{ matrix.os }}
62+
63+
strategy:
64+
matrix:
65+
os: [ ubuntu-latest ]
66+
jdk: [ 1.8, 11, 16 ]
67+
fail-fast: false
68+
69+
steps:
70+
- uses: actions/checkout@v2
71+
- name: Set up JDK ${{ matrix.jdk }}
72+
uses: actions/setup-java@v1
73+
with:
74+
java-version: ${{ matrix.jdk }}
75+
- name: Cache Gradle packages
76+
uses: actions/cache@v1
77+
with:
78+
path: ~/.gradle/caches
79+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
80+
restore-keys: ${{ runner.os }}-gradle
81+
- name: Grant execute permission for gradlew
82+
run: chmod +x gradlew
83+
- name: Build with Gradle
84+
run: ./gradlew test -x :rsocket-core:test --no-daemon
785

86+
jcstress:
87+
needs: [build]
888
runs-on: ${{ matrix.os }}
989

1090
strategy:
1191
matrix:
1292
os: [ ubuntu-latest ]
13-
jdk: [ 1.8, 11, 14 ]
93+
jdk: [ 1.8, 11, 16 ]
1494
fail-fast: false
1595

1696
steps:
@@ -28,4 +108,4 @@ jobs:
28108
- name: Grant execute permission for gradlew
29109
run: chmod +x gradlew
30110
- name: Build with Gradle
31-
run: ./gradlew clean build
111+
run: ./gradlew jcstress --no-daemon

‎build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
*/
1616

1717
plugins {
18-
id 'com.github.sherter.google-java-format' version '0.8' apply false
18+
id 'com.github.sherter.google-java-format' version '0.9' apply false
1919
id 'com.jfrog.artifactory' version '4.15.2' apply false
2020
id 'com.jfrog.bintray' version '1.8.5' apply false
21-
id 'me.champeau.gradle.jmh' version '0.5.0' apply false
22-
id 'io.spring.dependency-management' version '1.0.9.RELEASE' apply false
21+
id 'me.champeau.gradle.jmh' version '0.5.3' apply false
22+
id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
2323
id 'io.morethan.jmhreport' version '0.9.0' apply false
24+
id "io.github.reyerizo.gradle.jcstress" version "0.8.11" apply false
2425
}
2526

2627
boolean isCiServer = ["CI", "CONTINUOUS_INTEGRATION", "TRAVIS", "CIRCLECI", "bamboo_planKey", "GITHUB_ACTION"].with {

0 commit comments

Comments
 (0)