Skip to content

Commit 28ce179

Browse files
Merge pull request #947 from dragonwell-project/dragonwell_extended-11.0.27.24.6
Merge remote-tracking branch 'upstream/master' into dragonwell
2 parents d09c178 + bc3d621 commit 28ce179

99 files changed

Lines changed: 2457 additions & 1031 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/scripts/gen-build-failure-report.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,19 @@
2424
# questions.
2525
#
2626

27+
# Import common utils
28+
. .github/scripts/report-utils.sh
29+
2730
GITHUB_STEP_SUMMARY="$1"
2831
BUILD_DIR="$(ls -d build/*)"
2932

3033
# Send signal to the do-build action that we failed
3134
touch "$BUILD_DIR/build-failure"
3235

36+
# Collect hs_errs for build-time crashes, e.g. javac, jmod, jlink, CDS.
37+
# These usually land in make/
38+
hs_err_files=$(ls make/hs_err*.log 2> /dev/null || true)
39+
3340
(
3441
echo '### :boom: Build failure summary'
3542
echo ''
@@ -46,6 +53,20 @@ touch "$BUILD_DIR/build-failure"
4653
echo '</details>'
4754
echo ''
4855

56+
for hs_err in $hs_err_files; do
57+
echo "<details><summary><b>View HotSpot error log: "$hs_err"</b></summary>"
58+
echo ''
59+
echo '```'
60+
echo "$hs_err:"
61+
echo ''
62+
cat "$hs_err"
63+
echo '```'
64+
echo '</details>'
65+
echo ''
66+
done
67+
4968
echo ''
5069
echo ':arrow_right: To see the entire test log, click the job in the list to the left. To download logs, see the `failure-logs` [artifact above](#artifacts).'
5170
) >> $GITHUB_STEP_SUMMARY
71+
72+
truncate_summary

.github/scripts/gen-test-results.sh

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
# questions.
2525
#
2626

27+
# Import common utils
28+
. .github/scripts/report-utils.sh
29+
2730
GITHUB_STEP_SUMMARY="$1"
2831

2932
test_suite_name=$(cat build/run-test-prebuilt/test-support/test-last-ids.txt)
@@ -75,18 +78,6 @@ for test in $failures $errors; do
7578

7679
done >> $GITHUB_STEP_SUMMARY
7780

78-
# With many failures, the summary can easily exceed 1024 kB, the limit set by Github
79-
# Trim it down if so.
80-
summary_size=$(wc -c < $GITHUB_STEP_SUMMARY)
81-
if [[ $summary_size -gt 1000000 ]]; then
82-
# Trim to below 1024 kB, and cut off after the last detail group
83-
head -c 1000000 $GITHUB_STEP_SUMMARY | tac | sed -n -e '/<\/details>/,$ p' | tac > $GITHUB_STEP_SUMMARY.tmp
84-
mv $GITHUB_STEP_SUMMARY.tmp $GITHUB_STEP_SUMMARY
85-
(
86-
echo ''
87-
echo ':x: **WARNING: Summary is too large and has been truncated.**'
88-
echo ''
89-
) >> $GITHUB_STEP_SUMMARY
90-
fi
91-
9281
echo ':arrow_right: To see the entire test log, click the job in the list to the left.' >> $GITHUB_STEP_SUMMARY
82+
83+
truncate_summary

.github/scripts/report-utils.sh

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#!/bin/bash
2+
#
3+
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
4+
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5+
#
6+
# This code is free software; you can redistribute it and/or modify it
7+
# under the terms of the GNU General Public License version 2 only, as
8+
# published by the Free Software Foundation. Oracle designates this
9+
# particular file as subject to the "Classpath" exception as provided
10+
# by Oracle in the LICENSE file that accompanied this code.
11+
#
12+
# This code is distributed in the hope that it will be useful, but WITHOUT
13+
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14+
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15+
# version 2 for more details (a copy is included in the LICENSE file that
16+
# accompanied this code).
17+
#
18+
# You should have received a copy of the GNU General Public License version
19+
# 2 along with this work; if not, write to the Free Software Foundation,
20+
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21+
#
22+
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
23+
# or visit www.oracle.com if you need additional information or have any
24+
# questions.
25+
#
26+
27+
function truncate_summary() {
28+
# With large hs_errs, the summary can easily exceed 1024 kB, the limit set by Github
29+
# Trim it down if so.
30+
summary_size=$(wc -c < $GITHUB_STEP_SUMMARY)
31+
if [[ $summary_size -gt 1000000 ]]; then
32+
# Trim to below 1024 kB, and cut off after the last detail group
33+
head -c 1000000 $GITHUB_STEP_SUMMARY | tac | sed -n -e '/<\/details>/,$ p' | tac > $GITHUB_STEP_SUMMARY.tmp
34+
mv $GITHUB_STEP_SUMMARY.tmp $GITHUB_STEP_SUMMARY
35+
(
36+
echo ''
37+
echo ':x: **WARNING: Summary is too large and has been truncated.**'
38+
echo ''
39+
) >> $GITHUB_STEP_SUMMARY
40+
fi
41+
}

.github/workflows/build-macos.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ on:
5555
jobs:
5656
build-macos:
5757
name: build
58-
runs-on: macos-12
58+
runs-on: macos-13
5959

6060
strategy:
6161
fail-fast: false
@@ -98,6 +98,7 @@ jobs:
9898
--with-jtreg=${{ steps.jtreg.outputs.path }}
9999
--enable-jtreg-failure-handler
100100
--with-zlib=system
101+
--disable-warnings-as-errors
101102
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
102103
echo "Dumping config.log:" &&
103104
cat config.log &&

.github/workflows/build-riscv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ on:
6161
jobs:
6262
build-linux:
6363
name: build
64-
runs-on: ubuntu-20.04
64+
runs-on: ubuntu-22.04
6565

6666
strategy:
6767
fail-fast: false

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
make-arguments: ${{ github.event.inputs.make-arguments }}
7575
extra-conf-options: --with-default-make-target="product-bundles test-bundles" --with-jvm-features=shenandoahgc
7676
make-target: CONF_NAME=linux-x64
77-
runs-on: '"ubuntu-20.04"'
77+
runs-on: '"ubuntu-22.04"'
7878
if: needs.prerequisites.outputs.should_run != 'false' && needs.prerequisites.outputs.platform_linux_x64 != 'false'
7979

8080
build-linux-aarch64:
@@ -130,7 +130,7 @@ jobs:
130130
with:
131131
platform: linux-x64
132132
bootjdk-platform: linux-x64
133-
runs-on: '"ubuntu-20.04"'
133+
runs-on: '"ubuntu-22.04"'
134134

135135
test-linux-aarch64:
136136
name: linux-aarch64

.github/workflows/test.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,18 @@ jobs:
158158
continue-on-error: true
159159
if: steps.check_if_run.outputs.should_run != 'false'
160160

161+
- name: 'Install dependencies in x64 env'
162+
run: |
163+
# reduce c compiler version to avoid some self-dev cases cannot be compiled
164+
sudo apt install -y gcc-10 g++-10
165+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
166+
if: inputs.platform == 'linux-x64' && steps.check_if_run.outputs.should_run != 'false'
167+
161168
- name: 'Install dependencies'
162169
run: |
163170
# On macOS we need to install some dependencies for testing
164171
brew install make
165-
sudo xcode-select --switch /Applications/Xcode_13.4.1.app/Contents/Developer
172+
sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
166173
# This will make GNU make available as 'make' and not only as 'gmake'
167174
echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
168175
if: runner.os == 'macOS' && steps.check_if_run.outputs.should_run != 'false'

.jcheck/conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[general]
22
project=jdk-updates
33
jbs=JDK
4-
version=11.0.26
4+
version=11.0.27
55

66
[checks]
77
error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists

0 commit comments

Comments
 (0)