Merge pull request #42664 from gsmet/3.14.0-backports-1

[3.14] 3.14.0 backports 1
quarkusio · Aug 21, 2024 · e14797b · e14797b
2 parents 66429bd + 78efeb5
commit e14797b
Show file tree

Hide file tree

Showing 53 changed files with 777 additions and 429 deletions.
diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml
@@ -105,6 +105,8 @@ jobs:
  outputs:
  gib_args: ${{ steps.get-gib-args.outputs.gib_args }}
  gib_impacted: ${{ steps.get-gib-impacted.outputs.impacted_modules }}
+ m2-monthly-branch-cache-key: ${{ steps.cache-key.outputs.m2-monthly-branch-cache-key }}
+ m2-monthly-cache-key: ${{ steps.cache-key.outputs.m2-monthly-cache-key }}
  m2-cache-key: ${{ steps.cache-key.outputs.m2-cache-key }}
  quarkus-metadata-cache-key: ${{ steps.cache-key.outputs.quarkus-metadata-cache-key }}
  quarkus-metadata-cache-key-default: ${{ steps.cache-key.outputs.quarkus-metadata-cache-key-default }}
@@ -129,17 +131,31 @@ jobs:
  - name: Generate cache key
  id: cache-key
  run: |
+ CURRENT_BRANCH="${{ github.repository != 'quarkusio/quarkus' && 'fork' || github.base_ref || github.ref_name }}"
+ CURRENT_MONTH=$(/bin/date -u "+%Y-%m")
+ CURRENT_DAY=$(/bin/date -u "+%d")
+ ROOT_CACHE_KEY="m2-cache"
+ echo "m2-monthly-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}" >> $GITHUB_OUTPUT
+ echo "m2-monthly-branch-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}" >> $GITHUB_OUTPUT
+ echo "m2-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
  CURRENT_WEEK=$(/bin/date -u "+%Y-%U")
- echo "m2-cache-key=m2-cache-${CURRENT_WEEK}" >> $GITHUB_OUTPUT
  echo "quarkus-metadata-cache-key=quarkus-metadata-cache-${CURRENT_WEEK}-${{ github.ref_name }}" >> $GITHUB_OUTPUT
  echo "quarkus-metadata-cache-key-default=quarkus-metadata-cache-${CURRENT_WEEK}-${{ github.event.repository.default_branch }}" >> $GITHUB_OUTPUT
  - name: Cache Maven Repository
  id: cache-maven
  uses: actions/cache@v4
  with:
  path: ~/.m2/repository
- # refresh cache every week to avoid unlimited growth
+ # A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable but it's not a problem.
+ # The whole cache is dropped monthly to prevent unlimited growth.
+ # The cache is per branch but in case we don't find a branch for a given branch, we will get a cache from another branch.
  key: ${{ steps.cache-key.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ steps.cache-key.outputs.m2-monthly-branch-cache-key }}-
+ ${{ steps.cache-key.outputs.m2-monthly-cache-key }}-
+ - name: Populate the cache
+ run: |
+ ./mvnw -T2C $COMMON_MAVEN_ARGS dependency:go-offline
  - name: Verify native-tests.json
  run: ./.github/verify-tests-json.sh native-tests.json integration-tests/
  - name: Verify virtual-threads-tests.json
@@ -362,8 +378,10 @@ jobs:
  uses: actions/cache/restore@v4
  with:
  path: ~/.m2/repository
- # refresh cache every week to avoid unlimited growth
  key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
+ ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
  - name: Download .m2/repository/io/quarkus
  uses: actions/download-artifact@v4
  with:
@@ -467,8 +485,10 @@ jobs:
  uses: actions/cache/restore@v4
  with:
  path: ~/.m2/repository
- # refresh cache every week to avoid unlimited growth
  key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
+ ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
  - name: Download .m2/repository/io/quarkus
  uses: actions/download-artifact@v4
  with:
@@ -567,8 +587,10 @@ jobs:
  uses: actions/cache/restore@v4
  with:
  path: ~/.m2/repository
- # refresh cache every week to avoid unlimited growth
  key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
+ ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
  - name: Download .m2/repository/io/quarkus
  uses: actions/download-artifact@v4
  with:
@@ -657,8 +679,10 @@ jobs:
  uses: actions/cache/restore@v4
  with:
  path: ~/.m2/repository
- # refresh cache every week to avoid unlimited growth
  key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
+ ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
  - name: Download .m2/repository/io/quarkus
  uses: actions/download-artifact@v4
  with:
@@ -751,8 +775,10 @@ jobs:
  uses: actions/cache/restore@v4
  with:
  path: ~/.m2/repository
- # refresh cache every week to avoid unlimited growth
  key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
+ ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
  - name: Download .m2/repository/io/quarkus
  uses: actions/download-artifact@v4
  with:
@@ -832,8 +858,10 @@ jobs:
  uses: actions/cache/restore@v4
  with:
  path: ~/.m2/repository
- # refresh cache every week to avoid unlimited growth
  key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
+ ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
  - name: Download .m2/repository/io/quarkus
  uses: actions/download-artifact@v4
  with:
@@ -914,8 +942,10 @@ jobs:
  uses: actions/cache/restore@v4
  with:
  path: ~/.m2/repository
- # refresh cache every week to avoid unlimited growth
  key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
+ ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
  - name: Download .m2/repository/io/quarkus
  uses: actions/download-artifact@v4
  with:
@@ -996,8 +1026,10 @@ jobs:
  uses: actions/cache/restore@v4
  with:
  path: ~/.m2/repository
- # refresh cache every week to avoid unlimited growth
  key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
+ ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
  - name: Download .m2/repository/io/quarkus
  uses: actions/download-artifact@v4
  with:
@@ -1107,8 +1139,10 @@ jobs:
  uses: actions/cache/restore@v4
  with:
  path: ~/.m2/repository
- # refresh cache every week to avoid unlimited growth
  key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
+ ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
  - name: Download .m2/repository/io/quarkus
  uses: actions/download-artifact@v4
  with:

diff --git a/.github/workflows/ci-fork-mvn-cache.yml b/.github/workflows/ci-fork-mvn-cache.yml
diff --git a/.github/workflows/deploy-snapshots.yml b/.github/workflows/deploy-snapshots.yml
@@ -25,18 +25,24 @@ jobs:
  with:
  distribution: temurin
  java-version: 17
- - name: Get Date
- id: get-date
+ - name: Generate cache key
+ id: cache-key
  run: |
- echo "date=$(/bin/date -u "+%Y-%m")" >> $GITHUB_OUTPUT
- shell: bash
- - name: Cache Maven Repository
- id: cache-maven
- uses: actions/cache@v4
+ CURRENT_BRANCH="${{ github.repository != 'quarkusio/quarkus' && 'fork' || github.base_ref || github.ref_name }}"
+ CURRENT_MONTH=$(/bin/date -u "+%Y-%m")
+ CURRENT_DAY=$(/bin/date -u "+%d")
+ ROOT_CACHE_KEY="m2-cache"
+ echo "m2-monthly-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}" >> $GITHUB_OUTPUT
+ echo "m2-monthly-branch-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}" >> $GITHUB_OUTPUT
+ echo "m2-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
+ - name: Restore Maven Repository
+ uses: actions/cache/restore@v4
  with:
  path: ~/.m2/repository
- # refresh cache every month to avoid unlimited growth
- key: deploy-snapshots-${{ steps.get-date.outputs.date }}
+ key: ${{ steps.cache-key.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ steps.cache-key.outputs.m2-monthly-branch-cache-key }}-
+ ${{ steps.cache-key.outputs.m2-monthly-cache-key }}-
  - name: Build and Deploy
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_API_TOKEN }}

diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml
@@ -58,17 +58,24 @@ jobs:
  with:
  distribution: temurin
  java-version: 17
- - name: Get Date
- id: get-date
+ - name: Generate cache key
+ id: cache-key
  run: |
- echo "date=$(/bin/date -u "+%Y-%m")" >> $GITHUB_OUTPUT
- - name: Cache Maven Repository
- id: cache-maven
- uses: actions/cache@v4
+ CURRENT_BRANCH="${{ github.repository != 'quarkusio/quarkus' && 'fork' || github.base_ref || github.ref_name }}"
+ CURRENT_MONTH=$(/bin/date -u "+%Y-%m")
+ CURRENT_DAY=$(/bin/date -u "+%d")
+ ROOT_CACHE_KEY="m2-cache"
+ echo "m2-monthly-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}" >> $GITHUB_OUTPUT
+ echo "m2-monthly-branch-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}" >> $GITHUB_OUTPUT
+ echo "m2-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
+ - name: Restore Maven Repository
+ uses: actions/cache/restore@v4
  with:
  path: ~/.m2/repository
- # refresh cache every month to avoid unlimited growth
- key: q2maven-doc-${{ steps.get-date.outputs.date }}
+ key: ${{ steps.cache-key.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ steps.cache-key.outputs.m2-monthly-branch-cache-key }}-
+ ${{ steps.cache-key.outputs.m2-monthly-cache-key }}-
  - name: Build
  run: |
  ./mvnw -DquicklyDocs -B --settings .github/mvn-settings.xml

diff --git a/.github/workflows/native-it-selected-graalvm.yml b/.github/workflows/native-it-selected-graalvm.yml
@@ -52,6 +52,8 @@ jobs:
  outputs:
  gib_args: ${{ steps.get-gib-args.outputs.gib_args }}
  gib_impacted: ${{ steps.get-gib-impacted.outputs.impacted_modules }}
+ m2-monthly-branch-cache-key: ${{ steps.cache-key.outputs.m2-monthly-branch-cache-key }}
+ m2-monthly-cache-key: ${{ steps.cache-key.outputs.m2-monthly-cache-key }}
  m2-cache-key: ${{ steps.cache-key.outputs.m2-cache-key }}
  quarkus-metadata-cache-key: ${{ steps.cache-key.outputs.quarkus-metadata-cache-key }}
  quarkus-metadata-cache-key-default: ${{ steps.cache-key.outputs.quarkus-metadata-cache-key-default }}
@@ -77,17 +79,25 @@ jobs:
  - name: Generate cache key
  id: cache-key
  run: |
+ CURRENT_BRANCH="${{ github.repository != 'quarkusio/quarkus' && 'fork' || github.base_ref || github.ref_name }}"
+ CURRENT_MONTH=$(/bin/date -u "+%Y-%m")
+ CURRENT_DAY=$(/bin/date -u "+%d")
+ ROOT_CACHE_KEY="m2-cache"
+ echo "m2-monthly-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}" >> $GITHUB_OUTPUT
+ echo "m2-monthly-branch-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}" >> $GITHUB_OUTPUT
+ echo "m2-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
  CURRENT_WEEK=$(/bin/date -u "+%Y-%U")
- echo "m2-cache-key=m2-cache-${CURRENT_WEEK}" >> $GITHUB_OUTPUT
  echo "quarkus-metadata-cache-key=quarkus-metadata-cache-${CURRENT_WEEK}-${{ github.ref_name }}" >> $GITHUB_OUTPUT
  echo "quarkus-metadata-cache-key-default=quarkus-metadata-cache-${CURRENT_WEEK}-${{ github.event.repository.default_branch }}" >> $GITHUB_OUTPUT
- - name: Cache Maven Repository
- id: cache-maven
- uses: actions/cache@v4
+ - name: Restore Maven Repository
+ uses: actions/cache/restore@v4
  with:
  path: ~/.m2/repository
- # refresh cache every week to avoid unlimited growth
+ # This will always fail but we will default to the best matching restore keys
  key: ${{ steps.cache-key.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ steps.cache-key.outputs.m2-monthly-branch-cache-key }}-
+ ${{ steps.cache-key.outputs.m2-monthly-cache-key }}-
  - name: Verify native-tests.json
  run: ./.github/verify-tests-json.sh native-tests.json integration-tests/
  - name: Verify virtual-threads-tests.json
@@ -226,8 +236,10 @@ jobs:
  uses: actions/cache/restore@v4
  with:
  path: ~/.m2/repository
- # refresh cache every week to avoid unlimited growth
  key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
+ ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
  - name: Download .m2/repository/io/quarkus
  uses: actions/download-artifact@v4
  with:
@@ -329,8 +341,10 @@ jobs:
  uses: actions/cache/restore@v4
  with:
  path: ~/.m2/repository
- # refresh cache every week to avoid unlimited growth
  key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ needs.build-jdk17.outputs.m2-monthly-branch-cache-key }}-
+ ${{ needs.build-jdk17.outputs.m2-monthly-cache-key }}-
  - name: Download .m2/repository/io/quarkus
  uses: actions/download-artifact@v4
  with:

diff --git a/.github/workflows/owasp-check.yml b/.github/workflows/owasp-check.yml
@@ -26,6 +26,24 @@ jobs:
  distribution: temurin
  java-version: 17
 
+ - name: Generate cache key
+ id: cache-key
+ run: |
+ CURRENT_BRANCH="${{ github.repository != 'quarkusio/quarkus' && 'fork' || github.base_ref || github.ref_name }}"
+ CURRENT_MONTH=$(/bin/date -u "+%Y-%m")
+ CURRENT_DAY=$(/bin/date -u "+%d")
+ ROOT_CACHE_KEY="m2-cache"
+ echo "m2-monthly-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}" >> $GITHUB_OUTPUT
+ echo "m2-monthly-branch-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}" >> $GITHUB_OUTPUT
+ echo "m2-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
+ - name: Restore Maven Repository
+ uses: actions/cache/restore@v4
+ with:
+ path: ~/.m2/repository
+ key: ${{ steps.cache-key.outputs.m2-cache-key }}
+ restore-keys: |
+ ${{ steps.cache-key.outputs.m2-monthly-branch-cache-key }}-
+ ${{ steps.cache-key.outputs.m2-monthly-cache-key }}-
 
  - name: Build Java
  run: ./mvnw -B --settings .github/mvn-settings.xml -Dquickly-ci install