Skip to content

Commit

Permalink
[Automated] Merge in tag jdk-24+22
Browse files Browse the repository at this point in the history
PullRequest: labsjdk-ce/124
  • Loading branch information
OracleLabsAutomation authored and marwan-hallaoui committed Nov 4, 2024
2 parents f8d4d1b + 1b6919d commit 219ef3d
Show file tree
Hide file tree
Showing 1,342 changed files with 22,883 additions and 146,729 deletions.
84 changes: 84 additions & 0 deletions .github/actions/build-jtreg/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
#
# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#

name: 'Build JTReg'
description: 'Build JTReg'

runs:
using: composite
steps:
- name: 'Get JTReg version configuration'
id: version
uses: ./.github/actions/config
with:
var: JTREG_VERSION

- name: 'Check cache for already built JTReg'
id: get-cached
uses: actions/cache@v4
with:
path: jtreg/installed
key: jtreg-${{ steps.version.outputs.value }}

- name: 'Checkout the JTReg source'
uses: actions/checkout@v4
with:
repository: openjdk/jtreg
ref: jtreg-${{ steps.version.outputs.value }}
path: jtreg/src
if: (steps.get-cached.outputs.cache-hit != 'true')

- name: 'Build JTReg'
run: |
# Try building JTReg several times, backing off exponentially on failure.
# ~500 seconds in total should be enough to capture most of the transient
# failures.
for I in `seq 0 8`; do
rm -rf build/images/jtreg
bash make/build.sh --jdk "$JAVA_HOME_17_X64" && break
S=$(( 2 ** $I ))
echo "Failure. Waiting $S seconds before retrying"
sleep $S
done
# Check if build was successful
if [ ! -d build/images/jtreg ]; then
echo "Build failed"
exit 1;
fi
# Move files to the proper locations
mkdir ../installed
mv build/images/jtreg/* ../installed
working-directory: jtreg/src
shell: bash
if: (steps.get-cached.outputs.cache-hit != 'true')

- name: 'Upload JTReg artifact'
uses: actions/upload-artifact@v4
with:
name: bundles-jtreg-${{ steps.version.outputs.value }}
path: jtreg/installed
retention-days: 1
34 changes: 5 additions & 29 deletions .github/actions/get-jtreg/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#

name: 'Get JTReg'
description: 'Download JTReg from cache or source location'
description: 'Get JTReg'
outputs:
path:
description: 'Path to the installed JTReg'
Expand All @@ -39,36 +39,12 @@ runs:
with:
var: JTREG_VERSION

- name: 'Check cache for JTReg'
id: get-cached-jtreg
uses: actions/cache@v4
- name: 'Download JTReg artifact'
id: download-jtreg
uses: actions/download-artifact@v4
with:
name: bundles-jtreg-${{ steps.version.outputs.value }}
path: jtreg/installed
key: jtreg-${{ steps.version.outputs.value }}

- name: 'Checkout the JTReg source'
uses: actions/checkout@v4
with:
repository: openjdk/jtreg
ref: jtreg-${{ steps.version.outputs.value }}
path: jtreg/src
if: steps.get-cached-jtreg.outputs.cache-hit != 'true'

- name: 'Build JTReg'
run: |
# If runner architecture is x64 set JAVA_HOME_17_X64 otherwise set to JAVA_HOME_17_arm64
if [[ '${{ runner.arch }}' == 'X64' ]]; then
JDK="$JAVA_HOME_17_X64"
else
JDK="$JAVA_HOME_17_arm64"
fi
# Build JTReg and move files to the proper locations
bash make/build.sh --jdk "$JDK"
mkdir ../installed
mv build/images/jtreg/* ../installed
working-directory: jtreg/src
shell: bash
if: steps.get-cached-jtreg.outputs.cache-hit != 'true'

- name: 'Export path to where JTReg is installed'
id: path-name
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/gen-build-failure-report.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#

# Import common utils
. report-utils.sh
. .github/scripts/report-utils.sh

GITHUB_STEP_SUMMARY="$1"
BUILD_DIR="$(ls -d build/*)"
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/gen-test-results.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#

# Import common utils
. report-utils.sh
. .github/scripts/report-utils.sh

GITHUB_STEP_SUMMARY="$1"

Expand Down
71 changes: 41 additions & 30 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ jobs:
### Determine platforms to include
###

select:
name: 'Select platforms'
prepare:
name: 'Prepare the run'
runs-on: ubuntu-22.04
env:
# List of platforms to exclude by default
Expand All @@ -73,7 +73,19 @@ jobs:
docs: ${{ steps.include.outputs.docs }}

steps:
# This function must be inlined in main.yml, or we'd be forced to checkout the repo
- name: 'Checkout the scripts'
uses: actions/checkout@v4
with:
sparse-checkout: |
.github
make/conf/github-actions.conf
- name: 'Build JTReg'
id: jtreg
uses: ./.github/actions/build-jtreg

# TODO: Now that we are checking out the repo scripts, we can put the following code
# into a separate file
- name: 'Check what jobs to run'
id: include
run: |
Expand Down Expand Up @@ -149,18 +161,18 @@ jobs:

build-linux-x64:
name: linux-x64
needs: select
needs: prepare
uses: ./.github/workflows/build-linux.yml
with:
platform: linux-x64
gcc-major-version: '10'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.linux-x64 == 'true'
if: needs.prepare.outputs.linux-x64 == 'true'

build-linux-x86-hs:
name: linux-x86-hs
needs: select
needs: prepare
uses: ./.github/workflows/build-linux.yml
with:
platform: linux-x86
Expand All @@ -174,11 +186,11 @@ jobs:
extra-conf-options: '--with-target-bits=32 --enable-fallback-linker --enable-libffi-bundling'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.linux-x86-hs == 'true'
if: needs.prepare.outputs.linux-x86-hs == 'true'

build-linux-x64-hs-nopch:
name: linux-x64-hs-nopch
needs: select
needs: prepare
uses: ./.github/workflows/build-linux.yml
with:
platform: linux-x64
Expand All @@ -188,11 +200,11 @@ jobs:
extra-conf-options: '--disable-precompiled-headers'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.linux-x64-variants == 'true'
if: needs.prepare.outputs.linux-x64-variants == 'true'

build-linux-x64-hs-zero:
name: linux-x64-hs-zero
needs: select
needs: prepare
uses: ./.github/workflows/build-linux.yml
with:
platform: linux-x64
Expand All @@ -202,11 +214,11 @@ jobs:
extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.linux-x64-variants == 'true'
if: needs.prepare.outputs.linux-x64-variants == 'true'

build-linux-x64-hs-minimal:
name: linux-x64-hs-minimal
needs: select
needs: prepare
uses: ./.github/workflows/build-linux.yml
with:
platform: linux-x64
Expand All @@ -216,11 +228,11 @@ jobs:
extra-conf-options: '--with-jvm-variants=minimal --disable-precompiled-headers'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.linux-x64-variants == 'true'
if: needs.prepare.outputs.linux-x64-variants == 'true'

build-linux-x64-hs-optimized:
name: linux-x64-hs-optimized
needs: select
needs: prepare
uses: ./.github/workflows/build-linux.yml
with:
platform: linux-x64
Expand All @@ -231,68 +243,67 @@ jobs:
extra-conf-options: '--with-debug-level=optimized --disable-precompiled-headers'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.linux-x64-variants == 'true'
if: needs.prepare.outputs.linux-x64-variants == 'true'

build-linux-cross-compile:
name: linux-cross-compile
needs:
- select
needs: prepare
uses: ./.github/workflows/build-cross-compile.yml
with:
gcc-major-version: '10'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.linux-cross-compile == 'true'
if: needs.prepare.outputs.linux-cross-compile == 'true'

build-alpine-linux-x64:
name: alpine-linux-x64
needs: select
needs: prepare
uses: ./.github/workflows/build-alpine-linux.yml
with:
platform: alpine-linux-x64
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.alpine-linux-x64 == 'true'
if: needs.prepare.outputs.alpine-linux-x64 == 'true'

build-macos-x64:
name: macos-x64
needs: select
needs: prepare
uses: ./.github/workflows/build-macos.yml
with:
platform: macos-x64
runs-on: 'macos-13'
xcode-toolset-version: '14.3.1'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.macos-x64 == 'true'
if: needs.prepare.outputs.macos-x64 == 'true'

build-macos-aarch64:
name: macos-aarch64
needs: select
needs: prepare
uses: ./.github/workflows/build-macos.yml
with:
platform: macos-aarch64
runs-on: 'macos-14'
xcode-toolset-version: '14.3.1'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.macos-aarch64 == 'true'
if: needs.prepare.outputs.macos-aarch64 == 'true'

build-windows-x64:
name: windows-x64
needs: select
needs: prepare
uses: ./.github/workflows/build-windows.yml
with:
platform: windows-x64
msvc-toolset-version: '14.29'
msvc-toolset-architecture: 'x86.x64'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.windows-x64 == 'true'
if: needs.prepare.outputs.windows-x64 == 'true'

build-windows-aarch64:
name: windows-aarch64
needs: select
needs: prepare
uses: ./.github/workflows/build-windows.yml
with:
platform: windows-aarch64
Expand All @@ -302,11 +313,11 @@ jobs:
extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.windows-aarch64 == 'true'
if: needs.prepare.outputs.windows-aarch64 == 'true'

build-docs:
name: docs
needs: select
needs: prepare
uses: ./.github/workflows/build-linux.yml
with:
platform: linux-x64
Expand All @@ -318,7 +329,7 @@ jobs:
gcc-major-version: '10'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.docs == 'true'
if: needs.prepare.outputs.docs == 'true'

###
### Test jobs
Expand Down
16 changes: 12 additions & 4 deletions doc/building.html
Original file line number Diff line number Diff line change
Expand Up @@ -2016,10 +2016,18 @@ <h4 id="spaces-in-path">Spaces in Path</h4>
have <a
href="https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/fsutil-8dot3name">short
paths</a>. You can run <code>fsutil file setshortname</code> in
<code>cmd</code> on certain directories, such as
<code>Microsoft Visual Studio</code> or <code>Windows Kits</code>, to
assign arbitrary short paths so <code>configure</code> can access
them.</p>
<code>cmd</code> on directories to assign arbitrary short paths so
<code>configure</code> can access them. If the result says "Access
denied", it may be that there are processes running in that directory;
in this case, you can reboot Windows in safe mode and run the command on
those directories again.</p>
<p>The only directories required to have short paths are
<code>Microsoft Visual Studio</code> and <code>Windows Kits</code>; the
rest of the "contains space" warnings from <code>configure</code>, such
as <code>IntelliJ IDEA</code>, can be ignored. You can choose any short
name; once it is set, <code>configure</code>'s tools like
<code>cygpath</code> can convert the directory with spaces to your
chosen short name and pass it to the build system.</p>
<h3 id="getting-help">Getting Help</h3>
<p>If none of the suggestions in this document helps you, or if you find
what you believe is a bug in the build system, please contact the Build
Expand Down
Loading

0 comments on commit 219ef3d

Please sign in to comment.