Skip to content

Commit

Permalink
Merge pull request #46262 from gsmet/fix-ci
Browse files Browse the repository at this point in the history
[3.8] Fix CI in 3.8 branch
  • Loading branch information
gsmet authored Feb 14, 2025
2 parents 7a66f72 + ebeb62f commit 620f645
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 45 deletions.
58 changes: 29 additions & 29 deletions .github/workflows/ci-actions-incremental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
run: |
echo -n ${{ github.event.number }} > pull-request-number
- name: Upload pull request number
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pull-request-number-${{ github.event.number }}
path: pull-request-number
Expand Down Expand Up @@ -194,15 +194,15 @@ jobs:
- name: Tar .m2/repository/io/quarkus
run: tar -czf m2-io-quarkus.tgz -C ~ .m2/repository/io/quarkus
- name: Upload .m2/repository/io/quarkus
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: m2-io-quarkus
path: m2-io-quarkus.tgz
retention-days: 7
- name: Delete snapshots artifacts from cache
run: find ~/.m2 -name \*-SNAPSHOT -type d -exec rm -rf {} +
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() || cancelled() }}
with:
name: "build-reports-Initial JDK 17 Build"
Expand Down Expand Up @@ -351,7 +351,7 @@ jobs:
# refresh cache every week to avoid unlimited growth
key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: m2-io-quarkus
path: .
Expand All @@ -378,14 +378,14 @@ jobs:
if: failure()
run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
- name: Upload failure Archive (if maven failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: test-reports-jvm${{matrix.java.name}}
path: 'test-reports.tgz'
retention-days: 7
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() || cancelled() }}
with:
name: "build-reports-JVM Tests - JDK ${{matrix.java.name}}"
Expand All @@ -396,7 +396,7 @@ jobs:
LICENSE.txt
retention-days: 7
- name: Upload build.log (if build failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() || cancelled() }}
with:
name: "build-logs-JVM Tests - JDK ${{matrix.java.name}}"
Expand Down Expand Up @@ -448,7 +448,7 @@ jobs:
# refresh cache every week to avoid unlimited growth
key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: m2-io-quarkus
path: .
Expand All @@ -475,7 +475,7 @@ jobs:
if: failure()
run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
- name: Upload failure Archive (if maven failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: test-reports-maven-java${{matrix.java.name}}
Expand All @@ -489,7 +489,7 @@ jobs:
if [ -d 'integration-tests/maven/target/test-classes/projects/qit?legacy?jar' ]; then mv 'integration-tests/maven/target/test-classes/projects/qit?legacy?jar' 'integration-tests/maven/target/test-classes/projects/qit--legacy--jar'; fi
if [ -d 'integration-tests/maven/target/test-classes/projects/qit?uber?jar' ]; then mv 'integration-tests/maven/target/test-classes/projects/qit?uber?jar' 'integration-tests/maven/target/test-classes/projects/qit--uber--jar'; fi
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() || cancelled() }}
with:
name: "build-reports-Maven Tests - JDK ${{matrix.java.name}}"
Expand Down Expand Up @@ -540,7 +540,7 @@ jobs:
# refresh cache every week to avoid unlimited growth
key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: m2-io-quarkus
path: .
Expand Down Expand Up @@ -568,7 +568,7 @@ jobs:
# Important: keep -pl ... in sync with "Calculate run flags"!
run: ./mvnw $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_ARGS clean install -pl integration-tests/gradle
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() || cancelled() }}
with:
name: "build-reports-Gradle Tests - JDK ${{matrix.java.name}}"
Expand Down Expand Up @@ -622,7 +622,7 @@ jobs:
# refresh cache every week to avoid unlimited growth
key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: m2-io-quarkus
path: .
Expand All @@ -648,14 +648,14 @@ jobs:
if: failure()
run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
- name: Upload failure Archive (if maven failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: test-reports-devtools-java${{matrix.java.name}}
path: 'test-reports.tgz'
retention-days: 7
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() || cancelled() }}
with:
name: "build-reports-Devtools Tests - JDK ${{matrix.java.name}}"
Expand Down Expand Up @@ -708,7 +708,7 @@ jobs:
# refresh cache every week to avoid unlimited growth
key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: m2-io-quarkus
path: .
Expand All @@ -734,14 +734,14 @@ jobs:
if: failure()
run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
- name: Upload failure Archive (if maven failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: test-reports-kubernetes-java${{matrix.java.name}}
path: 'test-reports.tgz'
retention-days: 7
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() || cancelled() }}
with:
name: "build-reports-Kubernetes Tests - JDK ${{matrix.java.name}}"
Expand Down Expand Up @@ -781,7 +781,7 @@ jobs:
# refresh cache every week to avoid unlimited growth
key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: m2-io-quarkus
path: .
Expand All @@ -805,7 +805,7 @@ jobs:
git clone -b 3.8 https://github.com/quarkusio/quarkus-quickstarts.git && cd quarkus-quickstarts
export LANG=en_US && ./mvnw -e -B -fae --settings .github/mvn-settings.xml clean verify -DskipTests
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() || cancelled() }}
with:
name: "build-reports-Quickstarts Compilation - JDK ${{matrix.java.name}}"
Expand Down Expand Up @@ -840,7 +840,7 @@ jobs:
# refresh cache every week to avoid unlimited growth
key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: m2-io-quarkus
path: .
Expand Down Expand Up @@ -871,7 +871,7 @@ jobs:
run: |
export LANG=en_US && ./mvnw $COMMON_MAVEN_ARGS -f integration-tests/virtual-threads -pl "$TEST_MODULES" $NATIVE_TEST_MAVEN_ARGS -Dextra-args=--enable-preview -Dquarkus.native.container-build=true
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() || cancelled() }}
with:
name: "build-reports-Virtual Thread Support Tests Native - ${{matrix.category}}"
Expand Down Expand Up @@ -913,7 +913,7 @@ jobs:
# refresh cache every week to avoid unlimited growth
key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: m2-io-quarkus
path: .
Expand All @@ -938,14 +938,14 @@ jobs:
if: failure()
run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
- name: Upload failure Archive (if maven failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: test-reports-tcks
path: 'test-reports.tgz'
retention-days: 7
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() || cancelled() }}
with:
name: "build-reports-MicroProfile TCKs Tests"
Expand Down Expand Up @@ -1016,7 +1016,7 @@ jobs:
# refresh cache every week to avoid unlimited growth
key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: m2-io-quarkus
path: .
Expand All @@ -1038,14 +1038,14 @@ jobs:
if: failure()
run: find . -type d -name '*-reports' -o -wholename '*/build/reports/tests/functionalTest' -o -name '*.log' | tar -czf test-reports.tgz -T -
- name: Upload failure Archive (if maven failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: test-reports-native-${{matrix.category}}
path: 'test-reports.tgz'
retention-days: 7
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() || cancelled() }}
with:
name: "build-reports-Native Tests - ${{matrix.category}}"
Expand All @@ -1063,7 +1063,7 @@ jobs:
needs: [build-jdk17,jvm-tests,maven-tests,gradle-tests,devtools-tests,kubernetes-tests,quickstarts-tests,tcks-test,native-tests,virtual-thread-native-tests]
if: always()
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
path: build-reports-artifacts
- name: Set up JDK 17
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-istio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
shell: bash
run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository
- name: Persist Maven repository
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: maven-repo
path: maven-repo.tgz
Expand All @@ -49,7 +49,7 @@ jobs:
distribution: 'temurin'
java-version: '17'
- name: Download Maven repository
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: maven-repo
path: .
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-kubernetes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
shell: bash
run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository
- name: Persist Maven repository
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: maven-repo
path: maven-repo.tgz
Expand All @@ -49,7 +49,7 @@ jobs:
distribution: 'temurin'
java-version: '17'
- name: Download Maven repository
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: maven-repo
path: .
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
distribution: 'temurin'
java-version: '17'
- name: Download Maven repository
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: maven-repo
path: .
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
distribution: 'temurin'
java-version: '17'
- name: Download Maven repository
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: maven-repo
path: .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
run: echo ${{ github.event.number }} > pr-id.txt

- name: Persist documentation
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: documentation
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jdk-early-access-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
shell: bash
run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
- name: Upload failure Archive (if maven failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: test-reports-linux-jvm${{ matrix.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/owasp-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Perform OWASP Dependency Check Report
run: ./mvnw -Dowasp-report

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: dependency-check-report
path: target/dependency-check-report.html
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/podman-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,14 @@ jobs:
shell: bash
run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
- name: Upload failure Archive (if maven failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: test-reports-jvm${{matrix.java.name}}
path: 'test-reports.tgz'
retention-days: 5
- name: Upload build reports (if build failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() || cancelled() }}
with:
name: "build-reports-JVM Tests - JDK ${{matrix.java.name}}"
Expand All @@ -179,15 +179,15 @@ jobs:
LICENSE.txt
retention-days: 2
- name: Upload gc.log
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "GC log - JDK ${{matrix.java.name}}"
path: |
**/windows-java-11.txt
!**/build/tmp/**
retention-days: 5
- name: Upload build.log (if build failed)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() || cancelled() }}
with:
name: "build-logs-JVM Tests - JDK ${{matrix.java.name}}"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
with:
repository: quarkusio/quarkusio.github.io
- name: Download PR Artifact
uses: dawidd6/action-download-artifact@v3
uses: actions/download-artifact@v4
with:
workflow: ${{ github.event.workflow_run.workflow_id }}
workflow_conclusion: success
run-id: ${{ github.event.workflow_run.id }}
name: documentation
path: documentation-temp
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Store PR id as variable
id: pr
run: |
Expand Down

0 comments on commit 620f645

Please sign in to comment.