Skip to content

Commit b6af0ae

Browse files
mjpt777mjpt777
committed
Merge remote-tracking branch 'origin/master'
2 parents 39b75cf + 04d1038 commit b6af0ae

File tree

7 files changed

+104
-75
lines changed

7 files changed

+104
-75
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,23 @@ jobs:
3232
os: [ 'ubuntu-22.04', 'windows-latest' ]
3333
steps:
3434
- name: Checkout code
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
36+
with:
37+
ref: ${{ github.event.pull_request.head.sha }}
3638
- name: Cache Gradle dependencies
37-
uses: actions/cache@v3
39+
uses: actions/cache@v4
3840
with:
3941
path: ~/.gradle/caches
4042
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
4143
restore-keys: |
4244
${{ runner.os }}-gradle-
4345
- name: Cache Gradle wrappers
44-
uses: actions/cache@v3
46+
uses: actions/cache@v4
4547
with:
4648
path: ~/.gradle/wrapper
4749
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
4850
- name: Setup java
49-
uses: actions/setup-java@v3
51+
uses: actions/setup-java@v4
5052
with:
5153
distribution: 'zulu'
5254
java-version: ${{ matrix.java }}
@@ -56,7 +58,7 @@ jobs:
5658
echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
5759
echo "BUILD_JAVA_VERSION=${{ matrix.java }}" >> $GITHUB_ENV
5860
- name: Setup java 8 to run the Gradle script
59-
uses: actions/setup-java@v3
61+
uses: actions/setup-java@v4
6062
with:
6163
distribution: 'zulu'
6264
java-version: 8
@@ -75,21 +77,23 @@ jobs:
7577
DOTNET_CLI_TELEMETRY_OPTOUT: 1
7678
steps:
7779
- name: Checkout code
78-
uses: actions/checkout@v3
80+
uses: actions/checkout@v4
81+
with:
82+
ref: ${{ github.event.pull_request.head.sha }}
7983
- name: Cache Gradle dependencies
80-
uses: actions/cache@v3
84+
uses: actions/cache@v4
8185
with:
8286
path: ~/.gradle/caches
8387
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
8488
restore-keys: |
8589
${{ runner.os }}-gradle-
8690
- name: Cache Gradle wrappers
87-
uses: actions/cache@v3
91+
uses: actions/cache@v4
8892
with:
8993
path: ~/.gradle/wrapper
9094
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
9195
- name: Cache NuGet dependencies
92-
uses: actions/cache@v3
96+
uses: actions/cache@v4
9397
with:
9498
path: ~/.nuget/packages
9599
key: ${{ runner.os }}-nuget-${{ hashFiles('csharp/**/*.sln') }}
@@ -118,16 +122,18 @@ jobs:
118122
CXX: g++-${{ matrix.version }}
119123
steps:
120124
- name: Checkout code
121-
uses: actions/checkout@v3
125+
uses: actions/checkout@v4
126+
with:
127+
ref: ${{ github.event.pull_request.head.sha }}
122128
- name: Cache Gradle dependencies
123-
uses: actions/cache@v3
129+
uses: actions/cache@v4
124130
with:
125131
path: ~/.gradle/caches
126132
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
127133
restore-keys: |
128134
${{ runner.os }}-gradle-
129135
- name: Cache Gradle wrappers
130-
uses: actions/cache@v3
136+
uses: actions/cache@v4
131137
with:
132138
path: ~/.gradle/wrapper
133139
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
@@ -153,16 +159,18 @@ jobs:
153159
CXX: g++-${{ matrix.version }}
154160
steps:
155161
- name: Checkout code
156-
uses: actions/checkout@v3
162+
uses: actions/checkout@v4
163+
with:
164+
ref: ${{ github.event.pull_request.head.sha }}
157165
- name: Cache Gradle dependencies
158-
uses: actions/cache@v3
166+
uses: actions/cache@v4
159167
with:
160168
path: ~/.gradle/caches
161169
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
162170
restore-keys: |
163171
${{ runner.os }}-gradle-
164172
- name: Cache Gradle wrappers
165-
uses: actions/cache@v3
173+
uses: actions/cache@v4
166174
with:
167175
path: ~/.gradle/wrapper
168176
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
@@ -189,16 +197,18 @@ jobs:
189197
CXX: clang++-${{ matrix.version }}
190198
steps:
191199
- name: Checkout code
192-
uses: actions/checkout@v3
200+
uses: actions/checkout@v4
201+
with:
202+
ref: ${{ github.event.pull_request.head.sha }}
193203
- name: Cache Gradle dependencies
194-
uses: actions/cache@v3
204+
uses: actions/cache@v4
195205
with:
196206
path: ~/.gradle/caches
197207
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
198208
restore-keys: |
199209
${{ runner.os }}-gradle-
200210
- name: Cache Gradle wrappers
201-
uses: actions/cache@v3
211+
uses: actions/cache@v4
202212
with:
203213
path: ~/.gradle/wrapper
204214
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
@@ -227,16 +237,18 @@ jobs:
227237
CXX: clang++-${{ matrix.version }}
228238
steps:
229239
- name: Checkout code
230-
uses: actions/checkout@v3
240+
uses: actions/checkout@v4
241+
with:
242+
ref: ${{ github.event.pull_request.head.sha }}
231243
- name: Cache Gradle dependencies
232-
uses: actions/cache@v3
244+
uses: actions/cache@v4
233245
with:
234246
path: ~/.gradle/caches
235247
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
236248
restore-keys: |
237249
${{ runner.os }}-gradle-
238250
- name: Cache Gradle wrappers
239-
uses: actions/cache@v3
251+
uses: actions/cache@v4
240252
with:
241253
path: ~/.gradle/wrapper
242254
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
@@ -265,7 +277,9 @@ jobs:
265277
CXX: clang++
266278
steps:
267279
- name: Checkout code
268-
uses: actions/checkout@v3
280+
uses: actions/checkout@v4
281+
with:
282+
ref: ${{ github.event.pull_request.head.sha }}
269283
- name: Install CMake
270284
run: |
271285
curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Darwin-x86_64.tar.gz
@@ -286,7 +300,9 @@ jobs:
286300
CXX: cl
287301
steps:
288302
- name: Checkout code
289-
uses: actions/checkout@v3
303+
uses: actions/checkout@v4
304+
with:
305+
ref: ${{ github.event.pull_request.head.sha }}
290306
- name: Install CMake
291307
run: |
292308
$client = new-object System.Net.WebClient
@@ -305,16 +321,18 @@ jobs:
305321
rust: [ stable, beta, nightly ]
306322
steps:
307323
- name: Checkout code
308-
uses: actions/checkout@v3
324+
uses: actions/checkout@v4
325+
with:
326+
ref: ${{ github.event.pull_request.head.sha }}
309327
- name: Cache Gradle dependencies
310-
uses: actions/cache@v3
328+
uses: actions/cache@v4
311329
with:
312330
path: ~/.gradle/caches
313331
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
314332
restore-keys: |
315333
${{ runner.os }}-gradle-
316334
- name: Cache Gradle wrappers
317-
uses: actions/cache@v3
335+
uses: actions/cache@v4
318336
with:
319337
path: ~/.gradle/wrapper
320338
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}

‎.github/workflows/codeql.yml‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,23 @@ jobs:
3737

3838
steps:
3939
- name: Checkout code
40-
uses: actions/checkout@v3
40+
uses: actions/checkout@v4
41+
with:
42+
ref: ${{ github.event.pull_request.head.sha }}
4143
- name: Cache Gradle dependencies
42-
uses: actions/cache@v3
44+
uses: actions/cache@v4
4345
with:
4446
path: ~/.gradle/caches
4547
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
4648
restore-keys: |
4749
${{ runner.os }}-gradle-
4850
- name: Cache Gradle wrappers
49-
uses: actions/cache@v3
51+
uses: actions/cache@v4
5052
with:
5153
path: ~/.gradle/wrapper
5254
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
5355
- name: Setup java
54-
uses: actions/setup-java@v3
56+
uses: actions/setup-java@v4
5557
with:
5658
distribution: 'zulu'
5759
java-version: ${{ matrix.java }}
@@ -92,21 +94,23 @@ jobs:
9294
DOTNET_CLI_TELEMETRY_OPTOUT: 1
9395
steps:
9496
- name: Checkout code
95-
uses: actions/checkout@v3
97+
uses: actions/checkout@v4
98+
with:
99+
ref: ${{ github.event.pull_request.head.sha }}
96100
- name: Cache Gradle dependencies
97-
uses: actions/cache@v3
101+
uses: actions/cache@v4
98102
with:
99103
path: ~/.gradle/caches
100104
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
101105
restore-keys: |
102106
${{ runner.os }}-gradle-
103107
- name: Cache Gradle wrappers
104-
uses: actions/cache@v3
108+
uses: actions/cache@v4
105109
with:
106110
path: ~/.gradle/wrapper
107111
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
108112
- name: Cache NuGet dependencies
109-
uses: actions/cache@v3
113+
uses: actions/cache@v4
110114
with:
111115
path: ~/.nuget/packages
112116
key: ${{ runner.os }}-nuget-${{ hashFiles('csharp/**/*.sln') }}
@@ -148,16 +152,18 @@ jobs:
148152
CXX: g++-${{ matrix.version }}
149153
steps:
150154
- name: Checkout code
151-
uses: actions/checkout@v3
155+
uses: actions/checkout@v4
156+
with:
157+
ref: ${{ github.event.pull_request.head.sha }}
152158
- name: Cache Gradle dependencies
153-
uses: actions/cache@v3
159+
uses: actions/cache@v4
154160
with:
155161
path: ~/.gradle/caches
156162
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
157163
restore-keys: |
158164
${{ runner.os }}-gradle-
159165
- name: Cache Gradle wrappers
160-
uses: actions/cache@v3
166+
uses: actions/cache@v4
161167
with:
162168
path: ~/.gradle/wrapper
163169
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def toolchainLauncher = javaToolchains.launcherFor {
5656
def checkstyleVersion = '9.3'
5757
def hamcrestVersion = '2.2'
5858
def mockitoVersion = '4.11.0'
59-
def junitVersion = '5.10.1'
59+
def junitVersion = '5.10.2'
6060
def jmhVersion = '1.37'
6161
def agronaVersion = '1.20.0'
6262
def agronaVersionRange = '[1.20.0,2.0[' // allow any release >= 1.20.0 and < 2.0.0

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
org.gradle.java.installations.auto-download=false
22
org.gradle.java.installations.fromEnv=BUILD_JAVA_HOME
33

4-
org.gradle.logging.level=warn
4+
org.gradle.logging.level=lifecycle
55
org.gradle.warning.mode=all
66

77
# HTTP timeouts for Gradle

0 commit comments

Comments
 (0)