Skip to content

Commit 17da47c

Browse files
jbachorikjbachorik
authored
Merge branch 'main' into jb/native_allocs
2 parents 0fe7fad + b1ba761 commit 17da47c

9 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎.github/workflows/cache_java.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
run: |
9797
curl -s "https://get.sdkman.io" | bash
9898
- name: Upload SDKMAN! as Artifact
99-
uses: actions/upload-artifact@v4
99+
uses: actions/upload-artifact@v7
100100
with:
101101
name: sdkman-installation-amd64
102102
path: ${{ env.SDKMAN_DIR }}
@@ -136,7 +136,7 @@ jobs:
136136
run: |
137137
curl -s "https://get.sdkman.io" | bash
138138
- name: Upload SDKMAN! as Artifact
139-
uses: actions/upload-artifact@v4
139+
uses: actions/upload-artifact@v7
140140
with:
141141
name: sdkman-installation-aarch64
142142
path: ${{ env.SDKMAN_DIR }}

‎.github/workflows/codecheck.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: |
3939
./gradlew scanBuild --no-daemon
4040
- name: Upload logs
41-
uses: actions/upload-artifact@v4
41+
uses: actions/upload-artifact@v7
4242
if: always()
4343
with:
4444
name: scan-build-reports

‎.github/workflows/test_workflow.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ jobs:
124124
echo "## 🔧 Unwinding Quality Report - ${{ matrix.java_version }} (amd64)" >> $GITHUB_STEP_SUMMARY
125125
cat ddprof-test/build/reports/unwinding-summary.md >> $GITHUB_STEP_SUMMARY
126126
- name: Upload build artifacts
127-
uses: actions/upload-artifact@v4
127+
uses: actions/upload-artifact@v7
128128
if: success()
129129
with:
130130
name: (build) test-linux-glibc-amd64 (${{ matrix.java_version }}, ${{ matrix.config }})
131131
path: build/
132132
- name: Upload failures
133-
uses: actions/upload-artifact@v4
133+
uses: actions/upload-artifact@v7
134134
if: failure()
135135
with:
136136
name: failures-glibc-${{ matrix.java_version }}-${{ matrix.config }}-amd64
@@ -140,13 +140,13 @@ jobs:
140140
run: |
141141
.github/scripts/prepare_reports.sh
142142
- name: Upload unwinding reports
143-
uses: actions/upload-artifact@v4
143+
uses: actions/upload-artifact@v7
144144
if: success() && matrix.config == 'debug'
145145
with:
146146
name: (unwinding-reports) unwinding-linux-glibc-amd64 (${{ matrix.java_version }}, ${{ matrix.config }})
147147
path: unwinding-reports
148148
- name: Upload test reports
149-
uses: actions/upload-artifact@v4
149+
uses: actions/upload-artifact@v7
150150
if: failure()
151151
with:
152152
name: (test-reports) test-linux-glibc-amd64 (${{ matrix.java_version }}, ${{ matrix.config }})
@@ -243,13 +243,13 @@ jobs:
243243
echo "## 🔧 Unwinding Quality Report - ${{ matrix.java_version }} (amd64-musl)" >> $GITHUB_STEP_SUMMARY
244244
cat ddprof-test/build/reports/unwinding-summary.md >> $GITHUB_STEP_SUMMARY
245245
- name: Upload build artifacts
246-
uses: actions/upload-artifact@v4
246+
uses: actions/upload-artifact@v7
247247
if: success()
248248
with:
249249
name: (build) test-linux-musl-amd64 (${{ matrix.java_version }}, ${{ matrix.config }})
250250
path: build/
251251
- name: Upload failures
252-
uses: actions/upload-artifact@v4
252+
uses: actions/upload-artifact@v7
253253
if: failure()
254254
with:
255255
name: failures-musl-${{ matrix.java_version }}-${{ matrix.config }}-amd64
@@ -259,13 +259,13 @@ jobs:
259259
run: |
260260
.github/scripts/prepare_reports.sh
261261
- name: Upload unwinding reports
262-
uses: actions/upload-artifact@v4
262+
uses: actions/upload-artifact@v7
263263
if: success() && matrix.config == 'debug'
264264
with:
265265
name: (unwinding-reports) unwinding-linux-musl-amd64 (${{ matrix.java_version }}, ${{ matrix.config }})
266266
path: unwinding-reports
267267
- name: Upload test reports
268-
uses: actions/upload-artifact@v4
268+
uses: actions/upload-artifact@v7
269269
if: failure()
270270
with:
271271
name: (test-reports) test-linux-musl-amd64 (${{ matrix.java_version }}, ${{ matrix.config }})
@@ -370,13 +370,13 @@ jobs:
370370
echo "## 🔧 Unwinding Quality Report - ${{ matrix.java_version }} (aarch64)" >> $GITHUB_STEP_SUMMARY
371371
cat ddprof-test/build/reports/unwinding-summary.md >> $GITHUB_STEP_SUMMARY
372372
- name: Upload build artifacts
373-
uses: actions/upload-artifact@v4
373+
uses: actions/upload-artifact@v7
374374
if: success()
375375
with:
376376
name: (build) test-linux-glibc-aarch64 (${{ matrix.java_version }}, ${{ matrix.config }})
377377
path: build/
378378
- name: Upload failures
379-
uses: actions/upload-artifact@v4
379+
uses: actions/upload-artifact@v7
380380
if: failure()
381381
with:
382382
name: failures-glibc-${{ matrix.java_version }}-${{ matrix.config }}-aarch64
@@ -386,13 +386,13 @@ jobs:
386386
run: |
387387
.github/scripts/prepare_reports.sh
388388
- name: Upload unwinding reports
389-
uses: actions/upload-artifact@v4
389+
uses: actions/upload-artifact@v7
390390
if: success() && matrix.config == 'debug'
391391
with:
392392
name: (unwinding-reports) unwinding-linux-glibc-aarch64 (${{ matrix.java_version }}, ${{ matrix.config }})
393393
path: unwinding-reports
394394
- name: Upload test reports
395-
uses: actions/upload-artifact@v4
395+
uses: actions/upload-artifact@v7
396396
if: failure()
397397
with:
398398
name: (test-reports) test-linux-glibc-aarch64 (${{ matrix.java_version }}, ${{ matrix.config }})
@@ -467,13 +467,13 @@ jobs:
467467
echo "## 🔧 Unwinding Quality Report - ${{ matrix.java_version }} (aarch64-musl)" >> $GITHUB_STEP_SUMMARY
468468
cat ddprof-test/build/reports/unwinding-summary.md >> $GITHUB_STEP_SUMMARY
469469
- name: Upload build artifacts
470-
uses: actions/upload-artifact@v4
470+
uses: actions/upload-artifact@v7
471471
if: success()
472472
with:
473473
name: (build) test-linux-musl-aarch64 (${{ matrix.java_version }}, ${{ matrix.config }})
474474
path: build/
475475
- name: Upload failures
476-
uses: actions/upload-artifact@v4
476+
uses: actions/upload-artifact@v7
477477
if: failure()
478478
with:
479479
name: failures-musl-${{ matrix.java_version }}-${{ matrix.config }}-aarch64
@@ -483,13 +483,13 @@ jobs:
483483
run: |
484484
.github/scripts/prepare_reports.sh
485485
- name: Upload unwinding reports
486-
uses: actions/upload-artifact@v4
486+
uses: actions/upload-artifact@v7
487487
if: success() && matrix.config == 'debug'
488488
with:
489489
name: (unwinding-reports) unwinding-linux-musl-aarch64 (${{ matrix.java_version }}, ${{ matrix.config }})
490490
path: unwinding-reports
491491
- name: Upload test reports
492-
uses: actions/upload-artifact@v4
492+
uses: actions/upload-artifact@v7
493493
if: failure()
494494
with:
495495
name: (test-reports) test-linux-musl-aarch64 (${{ matrix.java_version }}, ${{ matrix.config }})

‎build-logic/conventions/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repositories {
99

1010
dependencies {
1111
implementation("org.jetbrains.kotlin:kotlin-stdlib")
12-
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.2.1")
12+
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.3.0")
1313
}
1414

1515
gradlePlugin {

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[versions]
44
cpp-standard = "17"
55
kotlin = "1.9.22"
6-
spotless = "8.2.1"
6+
spotless = "8.3.0"
77

88
# Testing
99
junit = "5.9.2"
@@ -14,7 +14,7 @@ slf4j = "2.0.17"
1414
# Profiler runtime
1515
jmc = "8.1.0"
1616
jol = "0.17"
17-
lz4 = "1.10.3"
17+
lz4 = "1.10.4"
1818
snappy = "1.1.10.8"
1919
zstd = "1.5.7-7"
2020

‎gradle/wrapper/gradle-wrapper.jar‎

5.38 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 7 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)