Skip to content

Commit e5e4690

Browse files
myankelevmyankelev
committed
Merge branch 'master' into JDK-8373016
2 parents 26fec97 + 6af2742 commit e5e4690

File tree

3,537 files changed

+62541
-34262
lines changed

Some content is hidden

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

3,537 files changed

+62541
-34262
lines changed

‎.github/actions/build-jtreg/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

‎.github/actions/get-bundles/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

‎.github/actions/get-gtest/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

‎.github/actions/get-jtreg/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

‎.github/actions/get-msys2/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

‎.github/actions/upload-bundles/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

‎.github/workflows/build-alpine-linux.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@ on:
5959
jobs:
6060
build-linux:
6161
name: build
62-
runs-on: ubuntu-22.04
62+
runs-on: ubuntu-24.04
6363
container:
6464
image: alpine:3.20
6565

@@ -96,6 +96,7 @@ jobs:
9696
--with-boot-jdk=${{ steps.bootjdk.outputs.path }}
9797
--with-zlib=system
9898
--with-jmod-compress=zip-1
99+
--with-external-symbols-in-bundles=none
99100
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
100101
echo "Dumping config.log:" &&
101102
cat config.log &&

‎.github/workflows/build-cross-compile.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ on:
4848
jobs:
4949
build-cross-compile:
5050
name: build
51-
runs-on: ubuntu-22.04
51+
runs-on: ubuntu-24.04
5252

5353
strategy:
5454
fail-fast: false
@@ -179,6 +179,7 @@ jobs:
179179
--openjdk-target=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}
180180
--with-sysroot=sysroot
181181
--with-jmod-compress=zip-1
182+
--with-external-symbols-in-bundles=none
182183
CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-${{ inputs.gcc-major-version }}
183184
CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-${{ inputs.gcc-major-version }}
184185
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (

‎.github/workflows/build-linux.yml‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -75,7 +75,7 @@ on:
7575
jobs:
7676
build-linux:
7777
name: build
78-
runs-on: ubuntu-22.04
78+
runs-on: ubuntu-24.04
7979

8080
strategy:
8181
fail-fast: false
@@ -115,9 +115,21 @@ jobs:
115115
if [[ '${{ inputs.apt-architecture }}' != '' ]]; then
116116
sudo dpkg --add-architecture ${{ inputs.apt-architecture }}
117117
fi
118-
sudo apt-get update
119-
sudo apt-get install --only-upgrade apt
120-
sudo apt-get install gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} libxrandr-dev${{ steps.arch.outputs.suffix }} libxtst-dev${{ steps.arch.outputs.suffix }} libcups2-dev${{ steps.arch.outputs.suffix }} libasound2-dev${{ steps.arch.outputs.suffix }} ${{ inputs.apt-extra-packages }}
118+
sudo apt update
119+
sudo apt install --only-upgrade apt
120+
sudo apt install \
121+
gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} \
122+
g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} \
123+
libasound2-dev${{ steps.arch.outputs.suffix }} \
124+
libcups2-dev${{ steps.arch.outputs.suffix }} \
125+
libfontconfig1-dev${{ steps.arch.outputs.suffix }} \
126+
libx11-dev${{ steps.arch.outputs.suffix }} \
127+
libxext-dev${{ steps.arch.outputs.suffix }} \
128+
libxrandr-dev${{ steps.arch.outputs.suffix }} \
129+
libxrender-dev${{ steps.arch.outputs.suffix }} \
130+
libxt-dev${{ steps.arch.outputs.suffix }} \
131+
libxtst-dev${{ steps.arch.outputs.suffix }} \
132+
${{ inputs.apt-extra-packages }}
121133
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}
122134
123135
- name: 'Configure'
@@ -131,6 +143,7 @@ jobs:
131143
--with-gtest=${{ steps.gtest.outputs.path }}
132144
--with-zlib=system
133145
--with-jmod-compress=zip-1
146+
--with-external-symbols-in-bundles=none
134147
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
135148
echo "Dumping config.log:" &&
136149
cat config.log &&

‎.github/workflows/build-macos.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -110,6 +110,7 @@ jobs:
110110
--with-gtest=${{ steps.gtest.outputs.path }}
111111
--with-zlib=system
112112
--with-jmod-compress=zip-1
113+
--with-external-symbols-in-bundles=none
113114
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
114115
echo "Dumping config.log:" &&
115116
cat config.log &&

0 commit comments

Comments
 (0)