8240567: MethodTooLargeException thrown while creating a jlink image

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

@@ -32,6 +32,8 @@ inputs:
   debug-suffix:
     description: 'File name suffix denoting debug level, possibly empty'
     required: false
+  DEPLOY_KEY:
+    required: true
 
 runs:
   using: composite

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

@@ -181,4 +181,4 @@ jobs:
         uses: ./.github/actions/do-build
         with:
           make-target: 'hotspot ${{ inputs.make-arguments }}'
-          platform: linux-${{ matrix.target-cpu }}
+          platform: linux-${{ matrix.target-cpu }}

.github/workflows/build-linux.yml

@@ -41,7 +41,7 @@ on:
       debug-levels:
         required: false
         type: string
-        default: '[ "debug", "release" ]'
+        default: '[ "release" ]'
       gcc-major-version:
         required: true
         type: string
@@ -74,10 +74,6 @@ jobs:
       fail-fast: false
       matrix:
         debug-level: ${{ fromJSON(inputs.debug-levels) }}
-        include:
-          - debug-level: debug
-            flags: --with-debug-level=fastdebug
-            suffix: -debug
 
     steps:
       - name: 'Checkout the JDK source'

.github/workflows/build-macos.yml

@@ -41,7 +41,7 @@ on:
       debug-levels:
         required: false
         type: string
-        default: '[ "debug", "release" ]'
+        default: '[ "release" ]'
       xcode-toolset-version:
         required: true
         type: string
@@ -61,10 +61,6 @@ jobs:
       fail-fast: false
       matrix:
         debug-level: ${{ fromJSON(inputs.debug-levels) }}
-        include:
-          - debug-level: debug
-            flags: --with-debug-level=fastdebug
-            suffix: -debug
 
     steps:
       - name: 'Checkout the JDK source'

.github/workflows/build-windows.yml

@@ -41,7 +41,7 @@ on:
       debug-levels:
         required: false
         type: string
-        default: '[ "debug", "release" ]'
+        default: '[ "release" ]'
       msvc-toolset-version:
         required: true
         type: string
@@ -54,7 +54,6 @@ on:
       make-arguments:
         required: false
         type: string
-
 env:
   # These are needed to make the MSYS2 bash work properly
   MSYS2_PATH_TYPE: minimal
@@ -72,10 +71,6 @@ jobs:
       fail-fast: false
       matrix:
         debug-level: ${{ fromJSON(inputs.debug-levels) }}
-        include:
-          - debug-level: debug
-            flags: --with-debug-level=fastdebug
-            suffix: -debug
 
     steps:
       - name: 'Checkout the JDK source'

.github/workflows/main.yml

@@ -27,15 +27,18 @@ name: 'OpenJDK GHA Sanity Checks'
 
 on:
   push:
-    branches-ignore:
-      - master
-      - pr/*
+  workflow_call:
+    inputs:
+      configure-arguments:
+        description: 'Additional configure arguments'
+        required: false
+        type: string
+      make-arguments:
+        description: 'Additional make arguments'
+        required: false
+        type: string
   workflow_dispatch:
     inputs:
-      platforms:
-        description: 'Platform(s) to execute on (comma separated, e.g. "linux-x64, macos, aarch64")'
-        required: true
-        default: 'linux-x64, linux-x86, linux-x64-variants, linux-cross-compile, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
       configure-arguments:
         description: 'Additional configure arguments'
         required: false
@@ -68,56 +71,18 @@ 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: 'Check what jobs to run'
+      - name: 'Set what jobs to run'
         id: include
         run: |
-          # Determine which platform jobs to run
-
-          # Returns 'true' if the input platform list matches any of the platform monikers given as argument,
-          # 'false' otherwise.
-          # arg $1: platform name or names to look for
-          function check_platform() {
-            if [[ $GITHUB_EVENT_NAME == workflow_dispatch ]]; then
-              input='${{ github.event.inputs.platforms }}'
-            elif [[ $GITHUB_EVENT_NAME == push ]]; then
-              if [[ '${{ !secrets.JDK_SUBMIT_FILTER || startsWith(github.ref, 'refs/heads/submit/') }}' == 'false' ]]; then
-                # If JDK_SUBMIT_FILTER is set, and this is not a "submit/" branch, don't run anything
-                >&2 echo 'JDK_SUBMIT_FILTER is set and not a "submit/" branch'
-                echo 'false'
-                return
-              else
-                input='${{ secrets.JDK_SUBMIT_PLATFORMS }}'
-              fi
-            fi
-
-            normalized_input="$(echo ,$input, | tr -d ' ')"
-            if [[ "$normalized_input" == ",," ]]; then
-              # For an empty input, assume all platforms should run
-              echo 'true'
-              return
-            else
-              # Check for all acceptable platform names
-              for part in $* ; do
-                if echo "$normalized_input" | grep -q -e ",$part," ; then
-                  echo 'true'
-                  return
-                fi
-              done
-            fi
-
-            echo 'false'
-          }
-
-          echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $GITHUB_OUTPUT
-          echo "linux-x86=$(check_platform linux-x86 linux x86)" >> $GITHUB_OUTPUT
-          echo "linux-x64-variants=$(check_platform linux-x64-variants variants)" >> $GITHUB_OUTPUT
-          echo "linux-cross-compile=$(check_platform linux-cross-compile cross-compile)" >> $GITHUB_OUTPUT
-          echo "macos-x64=$(check_platform macos-x64 macos x64)" >> $GITHUB_OUTPUT
-          echo "macos-aarch64=$(check_platform macos-aarch64 macos aarch64)" >> $GITHUB_OUTPUT
-          echo "windows-x64=$(check_platform windows-x64 windows x64)" >> $GITHUB_OUTPUT
-          echo "windows-aarch64=$(check_platform windows-aarch64 windows aarch64)" >> $GITHUB_OUTPUT
-          echo "docs=$(check_platform docs)" >> $GITHUB_OUTPUT
+          echo "linux-x64=true" >> $GITHUB_OUTPUT
+          echo "linux-x86=false" >> $GITHUB_OUTPUT
+          echo "linux-x64-variants=false" >> $GITHUB_OUTPUT
+          echo "linux-cross-compile=false" >> $GITHUB_OUTPUT
+          echo "macos-x64=true" >> $GITHUB_OUTPUT
+          echo "macos-aarch64=true" >> $GITHUB_OUTPUT
+          echo "windows-x64=true" >> $GITHUB_OUTPUT
+          echo "windows-aarch64=false" >> $GITHUB_OUTPUT
+          echo "docs=false" >> $GITHUB_OUTPUT
 
   ###
   ### Build jobs
@@ -130,7 +95,7 @@ jobs:
     with:
       platform: linux-x64
       gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
+      apt-gcc-version: '10.5.0-1ubuntu1~22.04'
       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
@@ -144,7 +109,7 @@ jobs:
       platform: linux-x86
       gcc-major-version: '10'
       gcc-package-suffix: '-multilib'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
+      apt-gcc-version: '10.5.0-1ubuntu1~22.04'
       apt-architecture: 'i386'
       # Some multilib libraries do not have proper inter-dependencies, so we have to
       # install their dependencies manually.
@@ -163,7 +128,7 @@ jobs:
       make-target: 'hotspot'
       debug-levels: '[ "debug" ]'
       gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
+      apt-gcc-version: '10.5.0-1ubuntu1~22.04'
       extra-conf-options: '--disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -178,7 +143,7 @@ jobs:
       make-target: 'hotspot'
       debug-levels: '[ "debug" ]'
       gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
+      apt-gcc-version: '10.5.0-1ubuntu1~22.04'
       extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -193,7 +158,7 @@ jobs:
       make-target: 'hotspot'
       debug-levels: '[ "debug" ]'
       gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
+      apt-gcc-version: '10.5.0-1ubuntu1~22.04'
       extra-conf-options: '--with-jvm-variants=minimal --disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -209,7 +174,7 @@ jobs:
       # Technically this is not the "debug" level, but we can't inject a new matrix state for just this job
       debug-levels: '[ "debug" ]'
       gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
+      apt-gcc-version: '10.5.0-1ubuntu1~22.04'
       extra-conf-options: '--with-debug-level=optimized --disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -223,8 +188,8 @@ jobs:
     uses: ./.github/workflows/build-cross-compile.yml
     with:
       gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
-      apt-gcc-cross-version: '10.4.0-4ubuntu1~22.04cross1'
+      apt-gcc-version: '10.5.0-1ubuntu1~22.04'
+      apt-gcc-cross-version: '10.5.0-1ubuntu1~22.04cross1'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.select.outputs.linux-cross-compile == 'true'
@@ -290,7 +255,7 @@ jobs:
       # build JDK, and we do not need the additional testing of the graphs.
       extra-conf-options: '--disable-full-docs'
       gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
+      apt-gcc-version: '10.5.0-1ubuntu1~22.04'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.select.outputs.docs == 'true'
@@ -301,6 +266,7 @@ jobs:
 
   test-linux-x64:
     name: linux-x64
+    if: false
     needs:
       - build-linux-x64
     uses: ./.github/workflows/test.yml
@@ -311,6 +277,7 @@ jobs:
 
   test-linux-x86:
     name: linux-x86
+    if: false
     needs:
       - build-linux-x86
     uses: ./.github/workflows/test.yml
@@ -321,6 +288,7 @@ jobs:
 
   test-macos-x64:
     name: macos-x64
+    if: false
     needs:
       - build-macos-x64
     uses: ./.github/workflows/test.yml
@@ -331,6 +299,7 @@ jobs:
 
   test-windows-x64:
     name: windows-x64
+    if: false
     needs:
       - build-windows-x64
     uses: ./.github/workflows/test.yml
@@ -343,7 +312,7 @@ jobs:
   remove-bundles:
     name: 'Remove bundle artifacts'
     runs-on: ubuntu-22.04
-    if: always()
+    if: false
     needs:
       - build-linux-x64
       - build-linux-x86
@@ -385,3 +354,47 @@ jobs:
                 -X DELETE "$url" \
             || echo "Failed to remove bundle"
           done
+
+  upload-bundles:
+    name: Upload to builds.jabref.org
+    runs-on: ubuntu-22.04
+    needs:
+      - build-linux-x64
+      - build-macos-x64
+      - build-macos-aarch64
+      - build-windows-x64
+    steps:
+      - name: Get bundles-linux-x64
+        uses: actions/download-artifact@v3
+        with:
+          name: bundles-linux-x64
+          path: bundles
+      - name: Get bundles-macos-aarch64
+        uses: actions/download-artifact@v3
+        with:
+          name: bundles-macos-aarch64
+          path: bundles
+      - name: Get bundles-macos-x64
+        uses: actions/download-artifact@v3
+        with:
+          name: bundles-macos-x64
+          path: bundles
+      - name: Get bundles-windows-x64
+        uses: actions/download-artifact@v3
+        with:
+          name: bundles-windows-x64
+          path: bundles
+      - name: Remove obsolete files
+        run: |
+          rm bundles/symbols*
+          rm bundles/tests*
+      - name: rsync
+        uses: Pendect/action-rsyncer@v2.0.0
+        env:
+          DEPLOY_KEY: ${{ secrets.BUILDJABREFPRIVATEKEY }}
+        with:
+          flags: -vazr --itemize-changes --stats --partial-dir=/tmp/partial
+          options: ''
+          ssh_options: '-p 9922'
+          src: 'bundles/'
+          dest: jrrsync@build-upload.jabref.org:/var/www/files.jabref.org/www/jdks/

.github/workflows/sync-fork.yml

@@ -0,0 +1,34 @@
+name: 'Upstream Sync'
+
+on:
+  schedule:
+    - cron:  '5 2 * * *'
+  workflow_dispatch:
+
+jobs:
+  sync_latest_from_upstream:
+    runs-on: ubuntu-latest
+    name: Sync latest commits from upstream repo
+
+    steps:
+    - name: Checkout target repo
+      uses: actions/checkout@v3
+      with:
+        ref:  jdk21-fix-8240567
+        fetch-depth: '0'
+
+    - name: Sync upstream changes
+      run: |
+        git config --local user.email "action@github.com"
+        git config --local user.name "GitHub Actions"
+        git remote add upstream https://github.com/openjdk/jdk21.git
+        git fetch upstream
+        git merge upstream/master
+        git push
+
+  build:
+     # The GitHub trigger "push" does not trigger if a push happens inside a workflow.
+     # Thus, we manually trigger building
+     needs: sync_latest_from_upstream
+     uses: ./.github/workflows/main.yml
+     secrets: inherit