-
Notifications
You must be signed in to change notification settings - Fork 165
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
GH-4324 update pr verify actions #4325
Open
JervenBolleman
wants to merge
4
commits into
main
Choose a base branch
from
GH-4324-Update-pr-verify-actions
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
4d8cb1b
GH-4324 Separate out the formatting check into its own action
JervenBolleman e997f25
GH-4324 Use java action v3 which has an easier maven cache setup
JervenBolleman caf3274
GH-4324 Fix pr, use java 17 for formatting test change
JervenBolleman 01db978
GH-4324 Fix pr, new java action need distribution use the eclipse one
JervenBolleman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,25 @@ name: PR verify | |
| on: pull_request | ||
|
|
||
| jobs: | ||
| formatting: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Set up JDK | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: 17 | ||
| cache: 'maven' | ||
| - name: Check formatting | ||
| run: mvn -B formatter:validate impsort:check xml-format:xml-check | ||
| - name: Cancel workflow on failure | ||
| uses: vishnudxb/[email protected] | ||
| if: failure() | ||
| with: | ||
| repo: eclipse/rdf4j | ||
| workflow_id: ${{ github.run_id }} | ||
| access_token: ${{ github.token }} | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
|
|
@@ -11,18 +30,11 @@ jobs: | |
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Set up JDK | ||
| uses: actions/setup-java@v1 | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: ${{ matrix.jdk }} | ||
| - name: Cache local Maven repository | ||
| uses: actions/cache@v2 | ||
| with: | ||
| path: ~/.m2/repository | ||
| key: ${{ runner.os }}-jdk${{ matrix.jdk }}-maven-${{ hashFiles('**/pom.xml') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-jdk${{ matrix.jdk }}-maven- | ||
| - name: Check formatting | ||
| run: mvn -B formatter:validate impsort:check xml-format:xml-check | ||
| cache: 'maven' | ||
| - name: Build | ||
| run: mvn -B -U -T 2 clean install -Pquick,-formatting -Dmaven.javadoc.skip=true -Djapicmp.skip -Denforcer.skip=true -Danimal.sniffer.skip=true | ||
| - name: Test | ||
|
|
@@ -44,18 +56,11 @@ jobs: | |
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Set up JDK | ||
| uses: actions/setup-java@v1 | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: 11 | ||
| - name: Cache local Maven repository | ||
| uses: actions/cache@v2 | ||
| with: | ||
| path: ~/.m2/repository | ||
| key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-jdk11-maven- | ||
| - name: Check formatting | ||
| run: mvn -B formatter:validate impsort:check xml-format:xml-check | ||
| cache: 'maven' | ||
| - name: Build | ||
| run: mvn -B -U -T 2 clean install -Pquick,-formatting -Dmaven.javadoc.skip=true -Djapicmp.skip -Denforcer.skip=true -Danimal.sniffer.skip=true | ||
| - name: Verify | ||
|
|
@@ -77,18 +82,11 @@ jobs: | |
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Set up JDK | ||
| uses: actions/setup-java@v1 | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: 11 | ||
| - name: Cache local Maven repository | ||
| uses: actions/cache@v2 | ||
| with: | ||
| path: ~/.m2/repository | ||
| key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-jdk11-maven- | ||
| - name: Check formatting | ||
| run: mvn -B formatter:validate impsort:check xml-format:xml-check | ||
| cache: 'maven' | ||
| - name: Build | ||
| run: mvn -B -U -T 2 clean install -Pquick,-formatting -Dmaven.javadoc.skip=true -Djapicmp.skip -Denforcer.skip=true -Danimal.sniffer.skip=true | ||
| - name: Verify | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that if we make this its own job, we can get rid of this cancel step.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but don't we want to cancel the other jobs because they will need to run with the next push that has a formatting fix? So cancelling now saves some energy?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah good point. I had it in my head that this would only cancel the current job - but if it also kills the parallel jobs then it's definitely worth leaving in.