Skip to content

Commit

Permalink
Harmonize CI configuration
Browse files Browse the repository at this point in the history
This commit is a continuation of eacfd77 but for workflows specific
to the main branch.
  • Loading branch information
snicoll committed Jul 5, 2024
1 parent 3dba68f commit fd3bf5b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/actions/print-jvm-thread-dumps/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ runs:
shell: bash
run: |
for jvm_pid in $(jps -q -J-XX:+PerfDisableSharedMem); do
jcmd $java_pid Thread.print
jcmd $jvm_pid Thread.print
done
- if: ${{ runner.os == 'Windows' }}
shell: powershell
Expand Down
22 changes: 8 additions & 14 deletions .github/workflows/build-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ permissions:

jobs:
build:
name: Build pull request
name: Build Pull Request
runs-on: ubuntu-latest
if: ${{ github.repository == 'spring-projects/spring-framework' }}
steps:
Expand All @@ -15,27 +15,21 @@ jobs:
with:
java-version: '17'
distribution: 'liberica'

- name: Check out code
- name: Check Out
uses: actions/checkout@v4

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2

- name: Set up Gradle
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5

- name: Validate Gradle Wrapper
uses: gradle/actions/wrapper-validation@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
- name: Set Up Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
- name: Build
env:
CI: 'true'
GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
run: ./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --no-parallel --continue build

- name: Print JVM thread dumps when cancelled
- name: Print JVM Thread Dumps When Cancelled
uses: ./.github/actions/print-jvm-thread-dumps
if: cancelled()

- name: Upload build reports
- name: Upload Build Reports
uses: actions/upload-artifact@v4
if: failure()
with:
Expand Down

0 comments on commit fd3bf5b

Please sign in to comment.