Merge pull request #725 from JasonFengJ9/mergetmp

Merge master jdk-11.0.22+1 into openj9-staging

.github/actions/get-bootjdk/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, 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
@@ -104,6 +104,6 @@ runs:
  - name: 'Export path to where BootJDK is installed'
  id: path-name
  run: |
- # Export the path
- echo 'path=bootjdk/jdk' >> $GITHUB_OUTPUT
+ # Export the absolute path
+ echo "path=`pwd`/bootjdk/jdk" >> $GITHUB_OUTPUT
  shell: bash

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

@@ -47,7 +47,7 @@ runs:
  key: jtreg-${{ steps.version.outputs.value }}
 
  - name: 'Checkout the JTReg source'
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  repository: openjdk/jtreg
  ref: jtreg-${{ steps.version.outputs.value }}

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

@@ -34,11 +34,11 @@ runs:
  with:
  install: 'autoconf tar unzip zip make'
  path-type: minimal
- location: msys2
+ location: ${{ runner.tool_cache }}/msys2
 
  # We can't run bash until this is completed, so stick with pwsh
  - name: 'Set MSYS2 path'
  run: |
  # Prepend msys2/msys64/usr/bin to the PATH
- echo "$env:GITHUB_WORKSPACE/msys2/msys64/usr/bin" >> $env:GITHUB_PATH
+ echo "$env:RUNNER_TOOL_CACHE/msys2/msys64/usr/bin" >> $env:GITHUB_PATH
  shell: pwsh

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

@@ -29,14 +29,22 @@ on:
  workflow_call:
  inputs:
  gcc-major-version:
+ required: true
+ type: string
+ extra-conf-options:
+ required: false
+ type: string
+ configure-arguments:
+ required: false
+ type: string
+ make-arguments:
  required: false
  type: string
- default: '10'
 
 jobs:
  build-cross-compile:
  name: build
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
 
  strategy:
  fail-fast: false
@@ -48,22 +56,30 @@ jobs:
  - ppc64le
  include:
  - target-cpu: aarch64
- debian-arch: arm64
  gnu-arch: aarch64
+ debian-arch: arm64
+ debian-repository: https://httpredir.debian.org/debian/
+ debian-version: bullseye
  - target-cpu: arm
- debian-arch: armhf
  gnu-arch: arm
+ debian-arch: armhf
+ debian-repository: https://httpredir.debian.org/debian/
+ debian-version: bullseye
  gnu-abi: eabihf
  - target-cpu: s390x
- debian-arch: s390x
  gnu-arch: s390x
+ debian-arch: s390x
+ debian-repository: https://httpredir.debian.org/debian/
+ debian-version: bullseye
  - target-cpu: ppc64le
- debian-arch: ppc64el
  gnu-arch: powerpc64le
+ debian-arch: ppc64el
+ debian-repository: https://httpredir.debian.org/debian/
+ debian-version: bullseye
 
  steps:
  - name: 'Checkout the JDK source'
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: 'Get the BootJDK'
  id: bootjdk
@@ -105,22 +121,26 @@ jobs:
 
  - name: 'Create sysroot'
  run: >
- sudo qemu-debootstrap
+ sudo debootstrap
  --arch=${{ matrix.debian-arch }}
  --verbose
- --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev
+ --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype-dev,libpng-dev
  --resolve-deps
- buster
+ --variant=minbase
+ ${{ matrix.debian-version }}
  sysroot
- https://httpredir.debian.org/debian/
+ ${{ matrix.debian-repository }}
  if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
 
  - name: 'Prepare sysroot'
  run: |
  # Prepare sysroot and remove unused files to minimize cache
  sudo chroot sysroot symlinks -cr .
  sudo chown ${USER} -R sysroot
- rm -rf sysroot/{dev,proc,run,sys}
+ rm -rf sysroot/{dev,proc,run,sys,var}
+ rm -rf sysroot/usr/{sbin,bin,share}
+ rm -rf sysroot/usr/lib/{apt,gcc,udev,systemd}
+ rm -rf sysroot/usr/libexec/gcc
  if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
 
  - name: 'Configure'
@@ -135,12 +155,16 @@ jobs:
  --openjdk-target=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}
  --with-sysroot=sysroot
  --with-build-jdk=${{ steps.buildjdk.outputs.jdk-path }}
- CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-10
- CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-10
+ CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-${{ inputs.gcc-major-version }}
+ CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-${{ inputs.gcc-major-version }}
+ ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
+ echo "Dumping config.log:" &&
+ cat config.log &&
+ exit 1)
 
  - name: 'Build'
  id: build
  uses: ./.github/actions/do-build
  with:
- make-target: 'hotspot'
+ make-target: 'hotspot ${{ inputs.make-arguments }}'
  platform: linux-${{ matrix.target-cpu }}

.github/workflows/build-linux.yml

@@ -42,20 +42,30 @@ on:
  required: false
  type: string
  default: '[ "debug", "release" ]'
- apt-gcc-version:
+ gcc-major-version:
  required: true
  type: string
+ gcc-package-suffix:
+ required: false
+ type: string
+ default: ''
  apt-architecture:
  required: false
  type: string
  apt-extra-packages:
  required: false
  type: string
+ configure-arguments:
+ required: false
+ type: string
+ make-arguments:
+ required: false
+ type: string
 
 jobs:
  build-linux:
  name: build
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
 
  strategy:
  fail-fast: false
@@ -68,7 +78,7 @@ jobs:
 
  steps:
  - name: 'Checkout the JDK source'
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: 'Get the BootJDK'
  id: bootjdk
@@ -97,8 +107,8 @@ jobs:
  fi
  sudo apt-get update
  sudo apt-get install --only-upgrade apt
- sudo apt-get install gcc-${{ inputs.apt-gcc-version }} g++-${{ inputs.apt-gcc-version }} 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 }}
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
+ 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 }}
+ 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 }}
 
  - name: 'Configure'
  run: >
@@ -110,13 +120,16 @@ jobs:
  --with-jtreg=${{ steps.jtreg.outputs.path }}
  --enable-jtreg-failure-handler
  --with-zlib=system
- ${{ inputs.extra-conf-options }}
+ ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
+ echo "Dumping config.log:" &&
+ cat config.log &&
+ exit 1)
 
  - name: 'Build'
  id: build
  uses: ./.github/actions/do-build
  with:
- make-target: '${{ inputs.make-target }}'
+ make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
  platform: ${{ inputs.platform }}
  debug-suffix: '${{ matrix.suffix }}'
 

.github/workflows/build-macos.yml

@@ -45,6 +45,12 @@ on:
  xcode-toolset-version:
  required: true
  type: string
+ configure-arguments:
+ required: false
+ type: string
+ make-arguments:
+ required: false
+ type: string
 
 jobs:
  build-macos:
@@ -62,7 +68,7 @@ jobs:
 
  steps:
  - name: 'Checkout the JDK source'
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: 'Get the BootJDK'
  id: bootjdk
@@ -92,13 +98,16 @@ jobs:
  --with-jtreg=${{ steps.jtreg.outputs.path }}
  --enable-jtreg-failure-handler
  --with-zlib=system
- ${{ inputs.extra-conf-options }}
+ ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
+ echo "Dumping config.log:" &&
+ cat config.log &&
+ exit 1)
 
  - name: 'Build'
  id: build
  uses: ./.github/actions/do-build
  with:
- make-target: '${{ inputs.make-target }}'
+ make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
  platform: ${{ inputs.platform }}
  debug-suffix: '${{ matrix.suffix }}'
 

.github/workflows/build-windows.yml

@@ -48,6 +48,12 @@ on:
  msvc-toolset-architecture:
  required: true
  type: string
+ configure-arguments:
+ required: false
+ type: string
+ make-arguments:
+ required: false
+ type: string
 
 env:
  # These are needed to make the MSYS2 bash work properly
@@ -73,7 +79,7 @@ jobs:
 
  steps:
  - name: 'Checkout the JDK source'
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: 'Get MSYS2'
  uses: ./.github/actions/get-msys2
@@ -119,17 +125,21 @@ jobs:
  --with-jtreg=${{ steps.jtreg.outputs.path }}
  --enable-jtreg-failure-handler
  --with-msvc-toolset-version=${{ inputs.msvc-toolset-version }}
- ${{ inputs.extra-conf-options }}
+ ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
+ echo "Dumping config.log:" &&
+ cat config.log &&
+ exit 1)
  env:
  # We need a minimal PATH on Windows
  # Set PATH to "", so just GITHUB_PATH is included
  PATH: ''
+ shell: env /usr/bin/bash --login -eo pipefail {0}
 
  - name: 'Build'
  id: build
  uses: ./.github/actions/do-build
  with:
- make-target: '${{ inputs.make-target }}'
+ make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
  platform: ${{ inputs.platform }}
  debug-suffix: '${{ matrix.suffix }}'