Skip to content

Commit e2056dd

Browse files
committed
simplify!
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
1 parent 852a7a4 commit e2056dd

File tree

4 files changed

+24
-4858
lines changed

4 files changed

+24
-4858
lines changed

.github/workflows/analysis.yml

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-FileCopyrightText: 2025 Marcel Hibbe <dev@mhibbe.de>
22
# SPDX-License-Identifier: GPL-3.0-or-later
33

4-
name: "PR Analysis with SARIF"
4+
name: "PR Analysis"
55

66
on:
77
pull_request:
@@ -10,8 +10,8 @@ on:
1010
branches: [ "master", "main", "stable-*" ]
1111

1212
permissions:
13-
pull-requests: write
1413
contents: write
14+
pull-requests: write
1515

1616
concurrency:
1717
group: analysis-wrapper-${{ github.head_ref || github.run_id }}
@@ -20,25 +20,19 @@ concurrency:
2020
jobs:
2121
analysis:
2222
runs-on: ubuntu-latest
23+
2324
steps:
2425
- name: Checkout code
2526
uses: actions/checkout@v4
2627
with:
2728
fetch-depth: 0
2829

29-
- name: Setup Node.js
30-
uses: actions/setup-node@v3
31-
with:
32-
node-version: 20
33-
3430
- name: Setup JDK 17
3531
uses: actions/setup-java@v3
3632
with:
3733
distribution: temurin
3834
java-version: 17
39-
40-
- name: Install dependencies
41-
run: sudo apt install -y python3-defusedxml
35+
cache: gradle
4236

4337
- name: Run Lint
4438
run: |
@@ -54,28 +48,12 @@ jobs:
5448
run: |
5549
./gradlew --no-configuration-cache spotbugsGplayDebug
5650
57-
- name: Filter new Lint issues
58-
run: |
59-
if [ -f analysis/baselines/lint-baseline.sarif ]; then
60-
npx sarif-diff analysis/baselines/lint-baseline.sarif build/reports/lint-results-gplayDebug.sarif > build/reports/lint-new.sarif
61-
else
62-
cp build/reports/lint-results-gplayDebug.sarif build/reports/lint-new.sarif
63-
fi
64-
65-
- name: Filter new SpotBugs issues
66-
run: |
67-
if [ -f analysis/baselines/spotbugs-baseline.sarif ]; then
68-
npx sarif-diff analysis/baselines/spotbugs-baseline.sarif build/reports/spotbugs-results-gplayDebug.sarif > build/reports/spotbugs-new.sarif
69-
else
70-
cp build/reports/spotbugs-results-gplayDebug.sarif build/reports/spotbugs-new.sarif
71-
fi
72-
73-
- name: Upload new Lint issues
74-
uses: github/codeql-action/upload-sarif@v2
51+
- name: Upload Lint SARIF
52+
uses: github/codeql-action/upload-sarif@v3
7553
with:
76-
sarif_file: build/reports/lint-new.sarif
54+
sarif_file: build/reports/lint-results-gplayDebug.sarif
7755

78-
- name: Upload new SpotBugs issues
79-
uses: github/codeql-action/upload-sarif@v2
56+
- name: Upload SpotBugs SARIF
57+
uses: github/codeql-action/upload-sarif@v3
8058
with:
81-
sarif_file: build/reports/spotbugs-new.sarif
59+
sarif_file: build/reports/spotbugs-results.sarif

0 commit comments

Comments
 (0)