Skip to content

Commit f6562f3

Browse files
authored
Merge branch 'aeron-io:master' into master
2 parents e1577c3 + 445395e commit f6562f3

File tree

26 files changed

+1672
-124
lines changed

26 files changed

+1672
-124
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ jobs:
3535
java: [ '17', '21', '25' ]
3636
os: [ 'ubuntu-24.04', 'windows-latest', 'macos-15' ]
3737
steps:
38+
- name: Use faster temporary storage (Windows)
39+
if: runner.os == 'Windows'
40+
run: |
41+
echo "TMP=$env:RUNNER_TEMP" | Out-File $env:GITHUB_ENV -Encoding utf8 -Append
42+
echo "TEMP=$env:RUNNER_TEMP" | Out-File $env:GITHUB_ENV -Encoding utf8 -Append
3843
- name: Checkout code
3944
uses: actions/checkout@v5
4045
with:
@@ -62,7 +67,7 @@ jobs:
6267
distribution: 'zulu'
6368
java-version: ${{ env.JAVA_VERSION }}
6469
- name: Setup Gradle
65-
uses: gradle/actions/setup-gradle@v4
70+
uses: gradle/actions/setup-gradle@v5
6671
- name: Build with Gradle
6772
run: ./gradlew
6873
- name: Copy test logs
@@ -73,7 +78,7 @@ jobs:
7378
./gradlew tarTestLogs
7479
- name: Upload crash logs
7580
if: always() && steps.copy_test_logs.outputs.file == 'build/distributions/test_logs.tbz2'
76-
uses: actions/upload-artifact@v4
81+
uses: actions/upload-artifact@v5
7782
with:
7883
name: crash-logs-${{ matrix.os }}-java-${{ matrix.java }}
7984
path: ${{ steps.copy_test_logs.outputs.file }}
@@ -105,7 +110,7 @@ jobs:
105110
echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
106111
echo "BUILD_JAVA_VERSION=${{ env.JAVA_VERSION }}" >> $GITHUB_ENV
107112
- name: Setup Gradle
108-
uses: gradle/actions/setup-gradle@v4
113+
uses: gradle/actions/setup-gradle@v5
109114
- name: Cache NuGet dependencies
110115
uses: actions/cache@v4
111116
with:
@@ -157,7 +162,7 @@ jobs:
157162
echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
158163
echo "BUILD_JAVA_VERSION=${{ env.JAVA_VERSION }}" >> $GITHUB_ENV
159164
- name: Setup Gradle
160-
uses: gradle/actions/setup-gradle@v4
165+
uses: gradle/actions/setup-gradle@v5
161166
- name: Build
162167
run: ./cppbuild/cppbuild
163168

@@ -195,7 +200,7 @@ jobs:
195200
echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
196201
echo "BUILD_JAVA_VERSION=${{ env.JAVA_VERSION }}" >> $GITHUB_ENV
197202
- name: Setup Gradle
198-
uses: gradle/actions/setup-gradle@v4
203+
uses: gradle/actions/setup-gradle@v5
199204
- name: Build
200205
run: ./cppbuild/cppbuild
201206

@@ -226,7 +231,7 @@ jobs:
226231
echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
227232
echo "BUILD_JAVA_VERSION=${{ env.JAVA_VERSION }}" >> $GITHUB_ENV
228233
- name: Setup Gradle
229-
uses: gradle/actions/setup-gradle@v4
234+
uses: gradle/actions/setup-gradle@v5
230235
- name: Build
231236
run: cmake --version && ./cppbuild/cppbuild
232237

@@ -242,6 +247,10 @@ jobs:
242247
CC: cl
243248
CXX: cl
244249
steps:
250+
- name: Use faster temporary storage (Windows)
251+
run: |
252+
echo "TMP=$env:RUNNER_TEMP" | Out-File $env:GITHUB_ENV -Encoding utf8 -Append
253+
echo "TEMP=$env:RUNNER_TEMP" | Out-File $env:GITHUB_ENV -Encoding utf8 -Append
245254
- name: Checkout code
246255
uses: actions/checkout@v5
247256
with:
@@ -257,7 +266,7 @@ jobs:
257266
echo "BUILD_JAVA_HOME=$env:JAVA_HOME" | Out-File $env:GITHUB_ENV -Encoding utf8 -Append
258267
echo "BUILD_JAVA_VERSION=${{ env.JAVA_VERSION }}" | Out-File $env:GITHUB_ENV -Encoding utf8 -Append
259268
- name: Setup Gradle
260-
uses: gradle/actions/setup-gradle@v4
269+
uses: gradle/actions/setup-gradle@v5
261270
- name: Build
262271
run: cppbuild/cppbuild.cmd
263272

@@ -289,7 +298,7 @@ jobs:
289298
echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
290299
echo "BUILD_JAVA_VERSION=${{ env.JAVA_VERSION }}" >> $GITHUB_ENV
291300
- name: Setup Gradle
292-
uses: gradle/actions/setup-gradle@v4
301+
uses: gradle/actions/setup-gradle@v5
293302
- run: ./gradlew runRustTests
294303

295304
golang-build:
@@ -320,7 +329,7 @@ jobs:
320329
echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
321330
echo "BUILD_JAVA_VERSION=${{ env.JAVA_VERSION }}" >> $GITHUB_ENV
322331
- name: Setup Gradle
323-
uses: gradle/actions/setup-gradle@v4
332+
uses: gradle/actions/setup-gradle@v5
324333
- name: Generate jar
325334
run: ./gradlew assemble
326335
- name: Run tests

.github/workflows/codeql.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ jobs:
5656
echo "BUILD_JAVA_VERSION=${{ matrix.java }}" >> $GITHUB_ENV
5757
5858
- name: Setup Gradle
59-
uses: gradle/actions/setup-gradle@v4
59+
uses: gradle/actions/setup-gradle@v5
6060

6161
- name: Initialize CodeQL
62-
uses: github/codeql-action/init@v3
62+
uses: github/codeql-action/init@v4
6363
with:
6464
languages: ${{ matrix.language }}
6565
config-file: ./.github/codeql/codeql-config.yml
@@ -68,7 +68,7 @@ jobs:
6868
run: ./gradlew
6969

7070
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@v3
71+
uses: github/codeql-action/analyze@v4
7272
with:
7373
category: "/language:${{matrix.language}}"
7474

@@ -83,7 +83,7 @@ jobs:
8383
fail-fast: false
8484
matrix:
8585
language: [ 'csharp' ]
86-
dotnet: [ '10' ]
86+
dotnet: [ '9' ]
8787
env:
8888
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
8989
DOTNET_CLI_TELEMETRY_OPTOUT: 1
@@ -114,15 +114,15 @@ jobs:
114114
echo "BUILD_JAVA_VERSION=${{ env.JAVA_VERSION }}" >> $GITHUB_ENV
115115
116116
- name: Setup Gradle
117-
uses: gradle/actions/setup-gradle@v4
117+
uses: gradle/actions/setup-gradle@v5
118118

119119
- name: Setup dotnet
120120
uses: actions/setup-dotnet@v5
121121
with:
122122
dotnet-version: ${{ matrix.dotnet }}
123123

124124
- name: Initialize CodeQL
125-
uses: github/codeql-action/init@v3
125+
uses: github/codeql-action/init@v4
126126
with:
127127
languages: ${{ matrix.language }}
128128
config-file: ./.github/codeql/codeql-config.yml
@@ -131,7 +131,7 @@ jobs:
131131
run: ./csharp/build.sh
132132

133133
- name: Perform CodeQL Analysis
134-
uses: github/codeql-action/analyze@v3
134+
uses: github/codeql-action/analyze@v4
135135
with:
136136
category: "/language:${{matrix.language}}"
137137

@@ -169,14 +169,14 @@ jobs:
169169
echo "BUILD_JAVA_VERSION=${{ env.JAVA_VERSION }}" >> $GITHUB_ENV
170170
171171
- name: Setup Gradle
172-
uses: gradle/actions/setup-gradle@v4
172+
uses: gradle/actions/setup-gradle@v5
173173

174174
- name: Install compiler
175175
run: |
176176
sudo apt-get install -y g++-${{ matrix.version }}
177177
178178
- name: Initialize CodeQL
179-
uses: github/codeql-action/init@v3
179+
uses: github/codeql-action/init@v4
180180
with:
181181
languages: ${{ matrix.language }}
182182
config-file: ./.github/codeql/codeql-config.yml
@@ -185,7 +185,7 @@ jobs:
185185
run: ./cppbuild/cppbuild
186186

187187
- name: Perform CodeQL Analysis
188-
uses: github/codeql-action/analyze@v3
188+
uses: github/codeql-action/analyze@v4
189189
with:
190190
category: "/language:${{ matrix.language }}"
191191
upload: false
@@ -200,6 +200,6 @@ jobs:
200200
output: sarif-results/${{ matrix.language }}.sarif
201201

202202
- name: Upload SARIF
203-
uses: github/codeql-action/upload-sarif@v3
203+
uses: github/codeql-action/upload-sarif@v4
204204
with:
205205
sarif_file: sarif-results/${{ matrix.language }}.sarif

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
3838
echo "BUILD_JAVA_VERSION=${{ env.JAVA_VERSION }}" >> $GITHUB_ENV
3939
- name: Setup Gradle
40-
uses: gradle/actions/setup-gradle@v4
40+
uses: gradle/actions/setup-gradle@v5
4141
- name: Publish with Gradle
4242
run: ./gradlew publish uploadArtifactsToCentralPortal
4343
env:

.github/workflows/slow.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
distribution: 'zulu'
5858
java-version: ${{ env.JAVA_VERSION }}
5959
- name: Setup Gradle
60-
uses: gradle/actions/setup-gradle@v4
60+
uses: gradle/actions/setup-gradle@v5
6161
- name: Setup dotnet
6262
uses: actions/setup-dotnet@v5
6363
with:
@@ -74,12 +74,12 @@ jobs:
7474
./gradlew tarTestLogs
7575
- name: Upload crash logs
7676
if: always() && steps.copy_test_logs.outputs.file == 'build/distributions/test_logs.tbz2'
77-
uses: actions/upload-artifact@v4
77+
uses: actions/upload-artifact@v5
7878
with:
7979
name: crash-logs-${{ matrix.os }}-property-tests-java-${{matrix.java}}-dotnet-${{matrix.dotnet}}
8080
path: ${{ steps.copy_test_logs.outputs.file }}
8181
- name: Upload test results
82-
uses: actions/upload-artifact@v4
82+
uses: actions/upload-artifact@v5
8383
if: always()
8484
with:
8585
name: property-tests

.gitignore

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ cppbuild/*.cache
6464
cppbuild/Debug
6565
cppbuild/Release
6666
cppbuild/Win32
67+
cppbuild/cmake
6768

6869
# golang
6970
gocode/pkg
@@ -85,18 +86,8 @@ csharp/*/bin
8586
csharp/*/obj
8687
csharp/.vs
8788
csharp/TestResults
88-
csharp/sbe-generated/baseline
89-
csharp/sbe-generated/baseline-bigendian
90-
csharp/sbe-generated/extension
91-
csharp/sbe-generated/issue435
92-
csharp/sbe-generated/issue483
93-
csharp/sbe-generated/issue560
94-
csharp/sbe-generated/issue661
95-
csharp/sbe-generated/since-deprecated
96-
csharp/sbe-generated/order_check
97-
csharp/sbe-generated/mktdata/*.cs
98-
csharp/sbe-generated/uk_co_real_logic_sbe_benchmarks_fix
99-
csharp/sbe-generated/test_message_schema
89+
csharp/sbe-generated/
90+
!csharp/sbe-generated/sbe-generated.csproj
10091
csharp/sbe-tests/*.sbe
10192
csharp/nuget/
10293
csharp/csharp.sln.DotSettings.user

0 commit comments

Comments
 (0)