Merge pull request #345 from JasonFengJ9/mergestaging

Merge master jdk-17.0.12+1 into openj9-staging

.github/actions/do-build/action.yml

@@ -66,15 +66,15 @@ runs:
  shell: bash
 
  - name: 'Upload build logs'
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: failure-logs-${{ inputs.platform }}${{ inputs.debug-suffix }}
  path: failure-logs
  if: steps.check.outputs.failure == 'true'
 
  # This is the best way I found to abort the job with an error message
  - name: 'Notify about build failures'
- uses: actions/github-script@v6
+ uses: actions/github-script@v7
  with:
  script: core.setFailed('Build failed. See summary for details.')
  if: steps.check.outputs.failure == 'true'

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

@@ -65,7 +65,7 @@ runs:
 
  - name: 'Check cache for BootJDK'
  id: get-cached-bootjdk
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  path: bootjdk/jdk
  key: boot-jdk-${{ inputs.platform }}-${{ steps.sha256.outputs.value }}

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

@@ -48,14 +48,14 @@ runs:
  steps:
  - name: 'Download bundles artifact'
  id: download-bundles
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
  with:
  name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
  path: bundles
  continue-on-error: true
 
  - name: 'Download bundles artifact (retry)'
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
  with:
  name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
  path: bundles

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

@@ -41,7 +41,7 @@ runs:
 
  - name: 'Check cache for JTReg'
  id: get-cached-jtreg
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  path: jtreg/installed
  key: jtreg-${{ steps.version.outputs.value }}

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

@@ -30,8 +30,7 @@ runs:
  using: composite
  steps:
  - name: 'Install MSYS2'
- # use a specific release of msys2/setup-msys2 to prevent jtreg build failures on newer release
- uses: msys2/setup-msys2@7efe20baefed56359985e327d329042cde2434ff
+ uses: msys2/setup-msys2@v2.22.0
  with:
  install: 'autoconf tar unzip zip make'
  path-type: minimal

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

@@ -69,7 +69,7 @@ runs:
  shell: bash
 
  - name: 'Upload bundles artifact'
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
  path: bundles

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

@@ -61,27 +61,32 @@ jobs:
  debian-arch: arm64
  debian-repository: https://httpredir.debian.org/debian/
  debian-version: bullseye
+ tolerate-sysroot-errors: false
  - target-cpu: arm
  gnu-arch: arm
  debian-arch: armhf
  debian-repository: https://httpredir.debian.org/debian/
  debian-version: bullseye
+ tolerate-sysroot-errors: false
  gnu-abi: eabihf
  - target-cpu: s390x
  gnu-arch: s390x
  debian-arch: s390x
  debian-repository: https://httpredir.debian.org/debian/
  debian-version: bullseye
+ tolerate-sysroot-errors: false
  - target-cpu: ppc64le
  gnu-arch: powerpc64le
  debian-arch: ppc64el
  debian-repository: https://httpredir.debian.org/debian/
  debian-version: bullseye
+ tolerate-sysroot-errors: false
  - target-cpu: riscv64
  gnu-arch: riscv64
  debian-arch: riscv64
  debian-repository: https://httpredir.debian.org/debian/
  debian-version: sid
+ tolerate-sysroot-errors: true
 
  steps:
  - name: 'Checkout the JDK source'
@@ -93,13 +98,6 @@ jobs:
  with:
  platform: linux-x64
 
- # Use linux-x64 JDK bundle as build JDK
- - name: 'Get build JDK'
- id: buildjdk
- uses: ./.github/actions/get-bundles
- with:
- platform: linux-x64
-
  - name: 'Get GTest'
  id: gtest
  uses: ./.github/actions/get-gtest
@@ -120,7 +118,7 @@ jobs:
 
  - name: 'Check cache for sysroot'
  id: get-cached-sysroot
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  path: sysroot
  key: sysroot-${{ matrix.debian-arch }}-${{ hashFiles('./.github/workflows/build-cross-compile.yml') }}
@@ -130,6 +128,7 @@ jobs:
  if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
 
  - name: 'Create sysroot'
+ id: create-sysroot
  run: >
  sudo debootstrap
  --arch=${{ matrix.debian-arch }}
@@ -140,6 +139,7 @@ jobs:
  ${{ matrix.debian-version }}
  sysroot
  ${{ matrix.debian-repository }}
+ continue-on-error: ${{ matrix.tolerate-sysroot-errors }}
  if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
 
  - name: 'Prepare sysroot'
@@ -151,7 +151,12 @@ jobs:
  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'
+ if: steps.create-sysroot.outcome == 'success' && steps.get-cached-sysroot.outputs.cache-hit != 'true'
+
+ - name: 'Remove broken sysroot'
+ run: |
+ sudo rm -rf sysroot/
+ if: steps.create-sysroot.outcome != 'success' && steps.get-cached-sysroot.outputs.cache-hit != 'true'
 
  - name: 'Configure'
  run: >
@@ -165,17 +170,18 @@ jobs:
  --disable-precompiled-headers
  --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-${{ 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)
+ if: steps.create-sysroot.outcome == 'success' || steps.get-cached-sysroot.outputs.cache-hit == 'true'
 
  - name: 'Build'
  id: build
  uses: ./.github/actions/do-build
  with:
  make-target: 'hotspot ${{ inputs.make-arguments }}'
  platform: linux-${{ matrix.target-cpu }}
+ if: steps.create-sysroot.outcome == 'success' || steps.get-cached-sysroot.outputs.cache-hit == 'true'

.github/workflows/main.yml

@@ -130,8 +130,7 @@ jobs:
  gcc-major-version: '10'
  configure-arguments: ${{ github.event.inputs.configure-arguments }}
  make-arguments: ${{ github.event.inputs.make-arguments }}
- # The linux-x64 jdk bundle is used as buildjdk for the cross-compile job
- if: needs.select.outputs.linux-x64 == 'true' || needs.select.outputs.linux-cross-compile == 'true'
+ if: needs.select.outputs.linux-x64 == 'true'
 
  build-linux-x86:
  name: linux-x86
@@ -211,7 +210,6 @@ jobs:
  name: linux-cross-compile
  needs:
  - select
- - build-linux-x64
  uses: ./.github/workflows/build-cross-compile.yml
  with:
  gcc-major-version: '10'
@@ -338,7 +336,7 @@ jobs:
  # Hack to get hold of the api environment variables that are only defined for actions
  - name: 'Get API configuration'
  id: api
- uses: actions/github-script@v6
+ uses: actions/github-script@v7
  with:
  script: 'return { url: process.env["ACTIONS_RUNTIME_URL"], token: process.env["ACTIONS_RUNTIME_TOKEN"] }'
 

.github/workflows/test.yml

@@ -211,15 +211,15 @@ jobs:
  if: always()
 
  - name: 'Upload test results'
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  path: results
  name: ${{ steps.package.outputs.artifact-name }}
  if: always()
 
  # This is the best way I found to abort the job with an error message
  - name: 'Notify about test failures'
- uses: actions/github-script@v6
+ uses: actions/github-script@v7
  with:
  script: core.setFailed('${{ steps.run-tests.outputs.error-message }}')
  if: steps.run-tests.outputs.failure == 'true'

.jcheck/conf

@@ -1,7 +1,7 @@
 [general]
 project=jdk-updates
 jbs=JDK
-version=17.0.11
+version=17.0.12
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists

closed/autoconf/custom-hook.m4

@@ -663,12 +663,6 @@ AC_DEFUN_ONCE([CUSTOM_LATE_HOOK],
  # Create the custom-spec.gmk
  AC_CONFIG_FILES([$OUTPUTDIR/custom-spec.gmk:$CLOSED_AUTOCONF_DIR/custom-spec.gmk.in])
 
- # explicitly disable CDS archive generation (OpenJ9 does not support '-Xshare:dump')
- BUILD_CDS_ARCHIVE=false
-
- # explicitly disable classlist generation
- ENABLE_GENERATE_CLASSLIST=false
-
  if test "x$OPENJDK_BUILD_OS" = xwindows ; then
  OPENJ9_TOOL_DIR="$OUTPUTDIR/tools"
  AC_SUBST(OPENJ9_TOOL_DIR)

closed/autoconf/custom-spec.gmk.in

@@ -182,9 +182,6 @@ $(foreach var, \
 J9JCL_SOURCES_DIR := $(SUPPORT_OUTPUTDIR)/j9jcl
 J9JCL_SOURCES_DONEFILE := $(MAKESUPPORT_OUTPUTDIR)/j9jcl.done
 
-# Disable all hotspot features.
-JVM_FEATURES_server :=
-
 # Required by OpenJCEPlus.
 BUILD_OPENJCEPLUS := @BUILD_OPENJCEPLUS@
 OPENJCEPLUS_TOPDIR := $(TOPDIR)/OpenJCEPlus