@@ -18,29 +18,25 @@ jobs:
1818 runs-on : ubuntu-latest
1919 steps :
2020 - name : Cancel Previous Runs
21- uses : styfle/cancel-workflow-action@0.8 .0
21+ uses : styfle/cancel-workflow-action@0.9 .0
2222 with :
2323 access_token : ${{ github.token }}
2424 - name : Checkout source
2525 uses : actions/checkout@v2
2626 - name : Set up JDK
27- uses : actions/setup-java@v1
27+ uses : actions/setup-java@v2
2828 with :
29- java-version : 14
30- - uses : actions/cache@v1
31- name : Restore gradle cache
29+ java-version : 16
30+ distribution : ' adopt'
31+ - name : Restore gradle cache
32+ uses : actions/cache@v2
3233 with :
33- path : ~/.gradle/caches
34- key : ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
34+ path : |
35+ ~/.gradle/caches
36+ ~/.gradle/wrapper
37+ key : ${{ runner.os }}-gradle7-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
3538 restore-keys : |
36- ${{ runner.OS }}-gradle-${{ env.cache-name }}-
37- ${{ runner.OS }}-gradle-
38- ${{ runner.OS }}-
39- - uses : actions/cache@v1
40- name : Restore gradle wrapper
41- with :
42- path : ~/.gradle/wrapper
43- key : ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
39+ ${{ runner.os }}-gradle7-
4440 - name : Run check style reporter
4541 uses : nikitasavinov/checkstyle-action@master
4642 with :
@@ -60,23 +56,19 @@ jobs:
6056 - name : Checkout source
6157 uses : actions/checkout@v2
6258 - name : Set up JDK
63- uses : actions/setup-java@v1
59+ uses : actions/setup-java@v2
6460 with :
65- java-version : 14
66- - uses : actions/cache@v1
61+ java-version : 16
62+ distribution : ' adopt'
63+ - uses : actions/cache@v2
6764 name : Restore gradle cache
6865 with :
69- path : ~/.gradle/caches
70- key : ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
66+ path : |
67+ ~/.gradle/caches
68+ ~/.gradle/wrapper
69+ key : ${{ runner.os }}-gradle7-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
7170 restore-keys : |
72- ${{ runner.OS }}-gradle-${{ env.cache-name }}-
73- ${{ runner.OS }}-gradle-
74- ${{ runner.OS }}-
75- - uses : actions/cache@v1
76- name : Restore gradle wrapper
77- with :
78- path : ~/.gradle/wrapper
79- key : ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
71+ ${{ runner.os }}-gradle7-
8072 - name : Run tests
8173 run : xvfb-run --auto-servernum ./gradlew check -x checkstyleJmh -x checkstyleMain -x checkstyleTest
8274 env :
@@ -104,23 +96,19 @@ jobs:
10496 - name : Checkout source
10597 uses : actions/checkout@v2
10698 - name : Set up JDK
107- uses : actions/setup-java@v1
99+ uses : actions/setup-java@v2
108100 with :
109- java-version : 14
110- - uses : actions/cache@v1
111- name : Restore gradle cache
101+ java-version : 16
102+ distribution : ' adopt'
103+ - name : Restore gradle cache
104+ uses : actions/cache@v2
112105 with :
113- path : ~/.gradle/caches
114- key : ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
106+ path : |
107+ ~/.gradle/caches
108+ ~/.gradle/wrapper
109+ key : ${{ runner.os }}-gradle7-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
115110 restore-keys : |
116- ${{ runner.OS }}-gradle-${{ env.cache-name }}-
117- ${{ runner.OS }}-gradle-
118- ${{ runner.OS }}-
119- - uses : actions/cache@v1
120- name : Restore gradle wrapper
121- with :
122- path : ~/.gradle/wrapper
123- key : ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
111+ ${{ runner.os }}-gradle7-
124112 - name : Run tests on PostgreSQL
125113 run : ./gradlew databaseTest --rerun-tasks
126114 env :
@@ -150,23 +138,19 @@ jobs:
150138 - name : Checkout source
151139 uses : actions/checkout@v2
152140 - name : Set up JDK
153- uses : actions/setup-java@v1
141+ uses : actions/setup-java@v2
154142 with :
155- java-version : 14
156- - uses : actions/cache@v1
143+ java-version : 16
144+ distribution : ' adopt'
145+ - uses : actions/cache@v2
157146 name : Restore gradle cache
158147 with :
159- path : ~/.gradle/caches
160- key : ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
148+ path : |
149+ ~/.gradle/caches
150+ ~/.gradle/wrapper
151+ key : ${{ runner.os }}-gradle7-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
161152 restore-keys : |
162- ${{ runner.OS }}-gradle-${{ env.cache-name }}-
163- ${{ runner.OS }}-gradle-
164- ${{ runner.OS }}-
165- - uses : actions/cache@v1
166- name : Restore gradle wrapper
167- with :
168- path : ~/.gradle/wrapper
169- key : ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
153+ ${{ runner.os }}-gradle7-
170154 - name : Run GUI tests
171155 run : xvfb-run --auto-servernum ./gradlew guiTest
172156 env :
@@ -200,23 +184,19 @@ jobs:
200184 - name : Checkout source
201185 uses : actions/checkout@v2
202186 - name : Set up JDK
203- uses : actions/setup-java@v1
187+ uses : actions/setup-java@v2
204188 with :
205- java-version : 14
206- - uses : actions/cache@v1
207- name : Restore gradle cache
189+ java-version : 16
190+ distribution : ' adopt'
191+ - name : Restore gradle cache
192+ uses : actions/cache@v2
208193 with :
209- path : ~/.gradle/caches
210- key : ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
194+ path : |
195+ ~/.gradle/caches
196+ ~/.gradle/wrapper
197+ key : ${{ runner.os }}-gradle7-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
211198 restore-keys : |
212- ${{ runner.OS }}-gradle-${{ env.cache-name }}-
213- ${{ runner.OS }}-gradle-
214- ${{ runner.OS }}-
215- - uses : actions/cache@v1
216- name : Restore gradle wrapper
217- with :
218- path : ~/.gradle/wrapper
219- key : ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
199+ ${{ runner.os }}-gradle7-
220200 - name : Update test coverage metrics
221201 if : ${{ steps.checksecrets.outputs.secretspresent }}
222202 run : xvfb-run --auto-servernum ./gradlew jacocoTestReport && bash <(curl -s https://codecov.io/bash);
0 commit comments