Skip to content

Commit 83749cb

Browse files
zhengyu123zhengyu123
committed
Merge branch 'main' into zgu/refactor-vmstructs
2 parents 45eb88a + b3ea100 commit 83749cb

31 files changed

Lines changed: 403 additions & 321 deletions

‎.github/actions/setup_cached_java/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ runs:
2727
fi
2828
- name: Cache Build JDK [${{ inputs.arch }}]
2929
id: cache_build_jdk
30-
uses: actions/cache/restore@v4
30+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
3131
with:
3232
path: |
3333
jdks/${{ steps.infer_build_jdk.outputs.build_jdk }}
@@ -37,7 +37,7 @@ runs:
3737
enableCrossOsArchive: true
3838
- name: Cache JDK ${{ inputs.version }} [${{ inputs.arch }}]
3939
id: cache_jdk
40-
uses: actions/cache/restore@v4
40+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
4141
with:
4242
path: |
4343
jdks/jdk${{ inputs.version }}

‎.github/scripts/prepare_reports.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ cp ddprof-test/javacore*.txt test-reports/ || true
1212
cp ddprof-test/build/hs_err* test-reports/ || true
1313
cp -r ddprof-lib/build/tmp test-reports/native_build || true
1414
cp -r ddprof-test/build/reports/tests test-reports/tests || true
15+
cp build/logs/gdb-watchdog.log test-reports/ || true
1516
cp -r /tmp/recordings test-reports/recordings || true
1617
find ddprof-lib/build -name 'libjavaProfiler.*' -exec cp {} test-reports/ \; || true
1718

‎.github/workflows/approve-trivial.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
scope: DataDog/java-profiler
1818
policy: self.approve-trivial.approve-pr
1919
- name: Auto-approve PR
20-
uses: hmarr/auto-approve-action@v4
20+
uses: hmarr/auto-approve-action@8f929096a962e83ccdfa8afcf855f39f12d4dac7 # v4
2121
with:
2222
github-token: ${{ steps.octo-sts.outputs.token }}

‎.github/workflows/cache_java.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
sdkman_path: ${{ steps.export-path.outputs.sdkman_path }}
6969
steps:
7070
- name: Cache SDKMan! AMD64
71-
uses: actions/cache@v5
71+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
7272
with:
7373
path: sdkman
7474
key: sdkman-amd64-${{ github.run_id }}
@@ -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@v7
99+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
100100
with:
101101
name: sdkman-installation-amd64
102102
path: ${{ env.SDKMAN_DIR }}
@@ -109,7 +109,7 @@ jobs:
109109
sdkman_path: ${{ steps.export-path.outputs.sdkman_path }}
110110
steps:
111111
- name: Cache SDKMan! AARCH64
112-
uses: actions/cache@v5
112+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
113113
with:
114114
path: sdkman
115115
key: sdkman-aarch64-${{ github.run_id }}
@@ -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@v7
139+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
140140
with:
141141
name: sdkman-installation-aarch64
142142
path: ${{ env.SDKMAN_DIR }}
@@ -151,10 +151,10 @@ jobs:
151151
# FIXME: Zing disabled - Azul pulled public CDN access
152152
java_variant: [ "8", "8-orcl", "8-j9", "8-ibm", "11", "11-j9", "17", "17-j9", "17-graal", "21", "21-j9", "21-graal", "25", "25-graal" ]
153153
steps:
154-
- uses: actions/checkout@v6
154+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
155155
- name: Try restore cache JDK ${{ matrix.java_variant }}
156156
id: cache-jdk
157-
uses: actions/cache/restore@v5
157+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
158158
with:
159159
path: |
160160
${{ env.JDKS_DIR }}/jdk${{ matrix.java_variant }}
@@ -175,7 +175,7 @@ jobs:
175175
sudo apt-get install -y curl zip unzip
176176
- name: Download SDKMAN! from Artifact
177177
if: steps.check-cache.outputs.cache-hit != 'true'
178-
uses: actions/download-artifact@v7
178+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
179179
with:
180180
name: sdkman-installation-amd64
181181
path: sdkman
@@ -193,7 +193,7 @@ jobs:
193193
194194
- name: Save JDK ${{ matrix.java_variant }} cache
195195
if: steps.check-cache.outputs.cache-hit != 'true'
196-
uses: actions/cache/save@v5
196+
uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
197197
with:
198198
path: |
199199
${{ env.JDKS_DIR }}/jdk${{ matrix.java_variant }}
@@ -210,14 +210,14 @@ jobs:
210210
matrix:
211211
java_variant: [ "8-librca", "11-librca", "17-librca", "21-librca", "25-librca" ]
212212
steps:
213-
- uses: actions/checkout@v6
213+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
214214
- name: Setup OS
215215
run: |
216216
# This needs to be done early because alpine does not have bash and tar is also iffy
217217
apk update && apk add curl zip unzip bash tar
218218
- name: Cache JDK ${{ matrix.java_variant }}
219219
id: cache-jdk
220-
uses: actions/cache/restore@v5
220+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
221221
with:
222222
path: |
223223
${{ env.JDKS_DIR }}/jdk${{ matrix.java_variant }}
@@ -243,7 +243,7 @@ jobs:
243243
244244
- name: Save JDK ${{ matrix.java_variant }} cache
245245
if: steps.check-cache.outputs.cache-hit != 'true'
246-
uses: actions/cache/save@v5
246+
uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
247247
with:
248248
path: |
249249
${{ env.JDKS_DIR }}/jdk${{ matrix.java_variant }}
@@ -262,10 +262,10 @@ jobs:
262262
# FIXME: Zing disabled - Azul pulled public CDN access
263263
java_variant: [ "8", "8-j9", "11", "11-j9", "17", "17-j9", "17-graal", "21", "21-j9", "21-graal", "25", "25-graal" ]
264264
steps:
265-
- uses: actions/checkout@v6
265+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
266266
- name: Cache JDK ${{ matrix.java_variant }}
267267
id: cache-jdk
268-
uses: actions/cache/restore@v5
268+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
269269
with:
270270
path: |
271271
${{ env.JDKS_DIR }}/jdk${{ matrix.java_variant }}
@@ -286,7 +286,7 @@ jobs:
286286
sudo apt-get install -y curl zip unzip
287287
- name: Download SDKMAN! from Artifact
288288
if: steps.check-cache.outputs.cache-hit != 'true'
289-
uses: actions/download-artifact@v7
289+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
290290
with:
291291
name: sdkman-installation-aarch64
292292
path: sdkman
@@ -303,7 +303,7 @@ jobs:
303303
304304
- name: Save JDK ${{ matrix.java_variant }} cache
305305
if: steps.check-cache.outputs.cache-hit != 'true'
306-
uses: actions/cache/save@v5
306+
uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
307307
with:
308308
path: |
309309
${{ env.JDKS_DIR }}/jdk${{ matrix.java_variant }}
@@ -319,14 +319,14 @@ jobs:
319319
matrix:
320320
java_variant: [ "8-librca", "11-librca", "17-librca", "21-librca", "25-librca" ]
321321
steps:
322-
- uses: actions/checkout@v6
322+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
323323
- name: Setup OS
324324
run: |
325325
# This needs to be done early because alpine does not have bash and tar is also iffy
326326
sudo apt update && sudo apt install -y curl zip unzip bash tar
327327
- name: Cache JDK ${{ matrix.java_variant }}
328328
id: cache-jdk
329-
uses: actions/cache/restore@v5
329+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
330330
with:
331331
path: |
332332
${{ env.JDKS_DIR }}/jdk${{ matrix.java_variant }}
@@ -352,7 +352,7 @@ jobs:
352352

353353
- name: Save JDK ${{ matrix.java_variant }} cache
354354
if: steps.check-cache.outputs.cache-hit != 'true'
355-
uses: actions/cache/save@v5
355+
uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
356356
with:
357357
path: |
358358
${{ env.JDKS_DIR }}/jdk${{ matrix.java_variant }}

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ jobs:
4646
needs: check-for-pr
4747
if: needs.check-for-pr.outputs.skip != 'true'
4848
steps:
49-
- uses: actions/checkout@v6
49+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5050

5151
- name: Setup Java
52-
uses: actions/setup-java@v5
52+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
5353
with:
5454
distribution: 'zulu'
5555
java-version: '21'
@@ -63,15 +63,15 @@ jobs:
6363
sudo mv /usr/bin/clang-format-11 /usr/bin/clang-format
6464
6565
- name: Cache Gradle Wrapper Binaries
66-
uses: actions/cache@v5
66+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
6767
with:
6868
path: ~/.gradle/wrapper/dists
6969
key: gradle-wrapper-${{ runner.os }}-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
7070
restore-keys: |
7171
gradle-wrapper-${{ runner.os }}-
7272
7373
- name: Cache Gradle User Home
74-
uses: actions/cache@v5
74+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
7575
with:
7676
path: ~/.gradle/caches
7777
key: gradle-caches-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
@@ -87,10 +87,10 @@ jobs:
8787
needs: check-for-pr
8888
if: needs.check-for-pr.outputs.skip != 'true'
8989
steps:
90-
- uses: actions/checkout@v6
90+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9191

9292
- name: Setup Java
93-
uses: actions/setup-java@v5
93+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
9494
with:
9595
distribution: 'zulu'
9696
java-version: '21'
@@ -101,15 +101,15 @@ jobs:
101101
sudo apt-get install -y curl zip unzip binutils
102102
103103
- name: Cache Gradle Wrapper Binaries
104-
uses: actions/cache@v5
104+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
105105
with:
106106
path: ~/.gradle/wrapper/dists
107107
key: gradle-wrapper-${{ runner.os }}-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
108108
restore-keys: |
109109
gradle-wrapper-${{ runner.os }}-
110110
111111
- name: Cache Gradle User Home
112-
uses: actions/cache@v5
112+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
113113
with:
114114
path: ~/.gradle/caches
115115
key: gradle-caches-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
@@ -178,7 +178,7 @@ jobs:
178178
actions: read
179179
id-token: write
180180
steps:
181-
- uses: actions/checkout@v6
181+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
182182

183183
- name: Generate test summary
184184
env:

‎.github/workflows/codecheck.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
env:
2222
HEAD_REF: ${{ github.head_ref }}
2323
steps:
24-
- uses: actions/checkout@v6
24+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2525
- name: System setup
2626
run: |
2727
sudo apt-get update
2828
sudo apt install -y clang clang-tools openjdk-11-jdk
2929
- name: Set up Python
30-
uses: actions/setup-python@v6
30+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
3131
with:
3232
python-version: 3.9
3333
- name: Install Python dependencies
@@ -38,7 +38,7 @@ jobs:
3838
run: |
3939
./gradlew scanBuild --no-daemon
4040
- name: Upload logs
41-
uses: actions/upload-artifact@v7
41+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
4242
if: always()
4343
with:
4444
name: scan-build-reports
@@ -71,11 +71,11 @@ jobs:
7171

7272
steps:
7373
- name: Checkout repository
74-
uses: actions/checkout@v6
74+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7575

7676
# Initializes the CodeQL tools for scanning.
7777
- name: Initialize CodeQL
78-
uses: github/codeql-action/init@v4
78+
uses: github/codeql-action/init@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
7979
with:
8080
languages: ${{ matrix.language }}
8181
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -84,4 +84,4 @@ jobs:
8484
# queries: ./path/to/local/query, your-org/your-repo/queries@main
8585
- run: ./gradlew -x test assembleReleaseJar
8686
- name: Perform CodeQL Analysis
87-
uses: github/codeql-action/analyze@v4
87+
uses: github/codeql-action/analyze@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0

‎.github/workflows/gh_release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ jobs:
2626
if: (startsWith(github.event.ref, 'refs/tags/v_') || inputs.release_tag != '') && !endsWith(github.event.ref, '-SNAPSHOT')
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v6
29+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3030
with:
3131
fetch-depth: 0
32-
- uses: webfactory/ssh-agent@v0.9.1
32+
- uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
3333
with:
3434
ssh-private-key: ${{ secrets.SSH_PUSH_SECRET }}
3535
- name: Create Release [automatic]
3636
id: create_release_auto
37-
uses: ncipollo/release-action@v1
37+
uses: ncipollo/release-action@339a81892b84b4eeb0f6e744e4574d79d0d9b8dd # v1.21.0
3838
if: ${{ startsWith(github.ref, 'refs/tags/') }}
3939
with:
4040
generateReleaseNotes: true
@@ -44,7 +44,7 @@ jobs:
4444
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4545
- name: Create Release [manual]
4646
id: create_release_manual
47-
uses: ncipollo/release-action@v1
47+
uses: ncipollo/release-action@339a81892b84b4eeb0f6e744e4574d79d0d9b8dd # v1.21.0
4848
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
4949
with:
5050
generateReleaseNotes: true

‎.github/workflows/nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
if: failure()
2222
steps:
2323
- name: Download all failure artifacts
24-
uses: actions/download-artifact@v7
24+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
2525
with:
2626
pattern: failures-*
2727
path: ./artifacts

‎.github/workflows/release-validated.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ jobs:
3636
release_branch: ${{ steps.compute-version.outputs.release_branch }}
3737
steps:
3838
- name: Checkout repository
39-
uses: actions/checkout@v6
39+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4040
with:
4141
fetch-depth: 0
4242

4343
- name: Setup Java
44-
uses: actions/setup-java@v5
44+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
4545
with:
4646
distribution: 'zulu'
4747
java-version: '21'
@@ -148,12 +148,12 @@ jobs:
148148
runs-on: ubuntu-latest
149149
steps:
150150
- name: Check test results
151-
if: ${{ inputs.skip_tests != true && needs.pre-release-tests.result != 'success' }}
151+
if: ${{ inputs.dry_run != true && inputs.skip_tests != true && needs.pre-release-tests.result != 'success' }}
152152
run: |
153153
echo "::error::Pre-release tests failed. Cannot proceed with release."
154154
exit 1
155155
156-
- uses: webfactory/ssh-agent@v0.9.1
156+
- uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
157157
with:
158158
ssh-private-key: ${{ secrets.SSH_PUSH_SECRET }}
159159

@@ -168,7 +168,7 @@ jobs:
168168
git checkout $GITHUB_REF_NAME
169169
170170
- name: Setup Java
171-
uses: actions/setup-java@v5
171+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
172172
with:
173173
distribution: 'zulu'
174174
java-version: '21'

0 commit comments

Comments
 (0)