Skip to content

Commit

Permalink
Merge branch 'jenkinsci:main' into feature/ignore-sarif-suppressions
Browse files Browse the repository at this point in the history
  • Loading branch information
The-Jonsey authored Nov 27, 2024
2 parents 2b24b91 + 9ebf26a commit 1142c6c
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 10 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ jobs:

steps:
- uses: actions/checkout@v4
if: github.event_name == 'push'
- uses: actions/checkout@v4
with:
ref: "${{ github.event.pull_request.merge_commit_sha }}"
if: github.event_name == 'pull_request_target'
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v4
with:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,12 @@ jobs:
language: [ java ]

steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/checkout@v4
if: github.event_name == 'push'
- uses: actions/checkout@v4
with:
ref: "${{ github.event.pull_request.merge_commit_sha }}"
if: github.event_name == 'pull_request_target'

- name: Setup Java
uses: actions/setup-java@v4
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ jobs:

steps:
- uses: actions/checkout@v4
if: github.event_name == 'push'
- uses: actions/checkout@v4
with:
ref: "${{ github.event.pull_request.merge_commit_sha }}"
if: github.event_name == 'pull_request_target'
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
Expand All @@ -28,7 +33,7 @@ jobs:
- name: Generate coverage with JaCoCo
run: mvn -V --color always -ntp clean verify -Pci
- name: Upload coverage to Codecov
uses: codecov/[email protected].2
uses: codecov/[email protected].7
with:
file: 'target/site/jacoco/jacoco.xml'
disable_search: true
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/quality-monitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ jobs:
name: Build, test and monitor quality on Ubuntu

steps:
- uses: actions/checkout@v4
if: github.event_name == 'push'
- uses: actions/checkout@v4
with:
ref: "refs/pull/${{ github.event.number }}/merge"
ref: "${{ github.event.pull_request.merge_commit_sha }}"
if: github.event_name == 'pull_request_target'
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
Expand Down Expand Up @@ -78,12 +81,12 @@ jobs:
"id": "spotbugs",
"sourcePath": "src/main/java",
"pattern": "**/target/spotbugsXml.xml"
},
{
"id": "error-prone",
"pattern": "**/maven.log"
}
]
},
{
"id": "error-prone",
"pattern": "**/maven.log"
}
]
},
{
"name": "Vulnerabilities",
Expand Down

0 comments on commit 1142c6c

Please sign in to comment.