Skip to content

Commit d1af7e8

Browse files
jbachorikjbachorik
committed
unify reporting
1 parent 1301ed3 commit d1af7e8

4 files changed

Lines changed: 37 additions & 51 deletions

File tree

‎.github/actions/extract_versions/action.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ runs:
1111
set +e
1212
1313
# Extract Java version
14-
ls ${{ env.JAVA_TEST_HOME }}
15-
ls -la ${{ env.JAVA_TEST_HOME }}/bin/java
1614
${{ env.JAVA_TEST_HOME }}/bin/java -version
1715
JAVA_VERSION=$(${{ env.JAVA_TEST_HOME }}/bin/java -version 2>&1 | awk -F '"' '/version/ {
1816
split($2, v, "[._]");

‎.github/scripts/prepare_reports.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
mkdir -p reports
5+
cp /tmp/hs_err* reports/ || true
6+
cp ddprof-test/build/hs_err* reports/ || true
7+
cp -r ddprof-lib/build/tmp reports/native_build || true
8+
cp -r ddprof-test/build/reports/tests reports/tests || true
9+
cp -r /tmp/recordings reports/recordings || true
10+
find ddprof-lib/build -name 'libjavaProfiler.*' -exec cp {} reports/ \; || true

‎.github/workflows/cache_java.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ jobs:
196196
source .github/scripts/java_setup.sh
197197
198198
prepareJdk ${{ matrix.java_variant }} amd64-musl
199-
ldd jdks/jdk${{ matrix.java_variant }}/bin/java
200199
201200
cache-aarch64:
202201
needs: setup-sdkman-aarch64

‎.github/workflows/test_workflow.yml‎

Lines changed: 27 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -105,34 +105,27 @@ jobs:
105105
echo "glibc-${{ matrix.java_version }}-${{ matrix.config }}-amd64" >> failures_glibc-${{ matrix.java_version }}-${{ matrix.config }}-amd64.txt
106106
exit 1
107107
fi
108-
- name: Upload logs
109-
uses: actions/upload-artifact@v4
110-
if: always()
111-
with:
112-
name: reports-linux-glibc-${{ matrix.java_version }}-amd64.zip
113-
path: |
114-
/tmp/hs_err*
115-
ddprof-test/hs_err_*
116-
ddprof-test/build/reports/tests
117-
ddprof-lib/src/test/build/Testing/Temporary/LastTest.log
118-
ddprof-lib/build/tmp/compileReleaseLinuxCpp/output.txt
119108
- uses: actions/upload-artifact@v4
120109
if: success()
121110
with:
122-
name: glibc-${{ matrix.java_version }}-${{ matrix.config }}-amd64
111+
name: test-linux-glibc-amd64 (${{ matrix.java_version }}, ${{ matrix.config }})] (build)
123112
path: build/
124113
- uses: actions/upload-artifact@v4
125114
if: failure()
126115
with:
127-
name: failures
116+
name: failures-glibc-${{ matrix.java_version }}-${{ matrix.config }}-amd64
128117
path: failures_glibc-${{ matrix.java_version }}-${{ matrix.config }}-amd64.txt
118+
- name: Prepare reports
119+
if: failure()
120+
run: |
121+
.github/scripts/prepare_reports.sh
129122
- uses: actions/upload-artifact@v4
130123
if: failure()
131124
with:
132-
name: recordings
133-
path: /tmp/recordings
125+
name: test-linux-glibc-amd64 (${{ matrix.java_version }}, ${{ matrix.config }}) (reports)
126+
path: reports
134127

135-
test-linux-glibc-amd64-musl:
128+
test-linux-musl-amd64:
136129
strategy:
137130
fail-fast: false
138131
matrix:
@@ -216,35 +209,28 @@ jobs:
216209
EXIT_CODE=$?
217210
218211
if [ $EXIT_CODE -ne 0 ]; then
219-
echo "glibc-${{ matrix.java_version }}-${{ matrix.config }}-amd64" >> failures_glibc-${{ matrix.java_version }}-${{ matrix.config }}-amd64.txt
212+
echo "musl-${{ matrix.java_version }}-${{ matrix.config }}-amd64" >> failures_musl-${{ matrix.java_version }}-${{ matrix.config }}-amd64.txt
220213
exit 1
221214
fi
222-
- name: Upload logs
223-
uses: actions/upload-artifact@v4
224-
if: always()
225-
with:
226-
name: reports-linux-glibc-${{ matrix.java_version }}-amd64-musl.zip
227-
path: |
228-
/tmp/hs_err*
229-
ddprof-test/hs_err_*
230-
ddprof-test/build/reports/tests
231-
ddprof-lib/src/test/build/Testing/Temporary/LastTest.log
232-
ddprof-lib/build/tmp/compileReleaseLinuxCpp/output.txt
233215
- uses: actions/upload-artifact@v4
234216
if: success()
235217
with:
236-
name: glibc-${{ matrix.java_version }}-${{ matrix.config }}-amd64-musl
218+
name: test-linux-musl-amd64 (${{ matrix.java_version }}, ${{ matrix.config }})] (build)
237219
path: build/
238220
- uses: actions/upload-artifact@v4
239221
if: failure()
240222
with:
241-
name: failures
242-
path: failures_glibc-${{ matrix.java_version }}-${{ matrix.config }}-amd64-musl.txt
223+
name: failures-musl-${{ matrix.java_version }}-${{ matrix.config }}-amd64
224+
path: failures_musl-${{ matrix.java_version }}-${{ matrix.config }}-amd64.txt
225+
- name: Prepare reports
226+
if: failure()
227+
run: |
228+
.github/scripts/prepare_reports.sh
243229
- uses: actions/upload-artifact@v4
244230
if: failure()
245231
with:
246-
name: recordings
247-
path: /tmp/recordings
232+
name: test-linux-musl-amd64 (${{ matrix.java_version }}, ${{ matrix.config }}) (reports)
233+
path: reports
248234

249235
test-linux-glibc-aarch64:
250236
strategy:
@@ -341,29 +327,22 @@ jobs:
341327
echo "glibc-${{ matrix.java_version }}-${{ matrix.config }}-aarch64" >> failures_glibc-${{ matrix.java_version }}-${{ matrix.config }}-aarch64.txt
342328
exit 1
343329
fi
344-
- name: Upload logs
345-
uses: actions/upload-artifact@v4
346-
if: always()
347-
with:
348-
name: reports-linux-glibc-${{ matrix.java_version }}-aarch64.zip
349-
path: |
350-
/tmp/hs_err*
351-
ddprof-test/hs_err_*
352-
ddprof-test/build/reports/tests
353-
ddprof-lib/src/test/build/Testing/Temporary/LastTest.log
354-
ddprof-lib/build/tmp/compileReleaseLinuxCpp/output.txt
355330
- uses: actions/upload-artifact@v4
356331
if: success()
357332
with:
358-
name: glibc-${{ matrix.java_version }}-${{ matrix.config }}-aarch64
333+
name: test-linux-glibc-aarch64 (${{ matrix.java_version }}, ${{ matrix.config }})] (build)
359334
path: build/
360335
- uses: actions/upload-artifact@v4
361336
if: failure()
362337
with:
363-
name: failures
338+
name: failures-glibc-${{ matrix.java_version }}-${{ matrix.config }}-aarch64
364339
path: failures_glibc-${{ matrix.java_version }}-${{ matrix.config }}-aarch64.txt
340+
- name: Prepare reports
341+
if: failure()
342+
run: |
343+
.github/scripts/prepare_reports.sh
365344
- uses: actions/upload-artifact@v4
366345
if: failure()
367346
with:
368-
name: recordings
369-
path: /tmp/recordings
347+
name: test-linux-glibc-aarch64 (${{ matrix.java_version }}, ${{ matrix.config }}) (reports)
348+
path: reports

0 commit comments

Comments
 (0)