Skip to content

Commit 352673a

Browse files
feat: Improve code analysis workflow (#7543)
Add build cache save/restore Disable CodeQL SARIF result upload to Datadog
1 parent dd52c81 commit 352673a

File tree

1 file changed

+30
-8
lines changed

1 file changed

+30
-8
lines changed

.github/workflows/analyze-changes.yaml

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,22 @@ jobs:
4343
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # 4.1.6
4444
with:
4545
submodules: 'recursive'
46+
47+
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
48+
with:
49+
path: |
50+
~/.gradle/caches
51+
~/.gradle/wrapper
52+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
53+
restore-keys: |
54+
${{ runner.os }}-gradle-
55+
4656
- name: Initialize CodeQL
4757
uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
4858
with:
4959
languages: 'java'
5060
build-mode: 'manual'
61+
5162
- name: Build dd-trace-java for creating the CodeQL database
5263
run: |
5364
GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G'" \
@@ -58,17 +69,19 @@ jobs:
5869
JAVA_21_HOME=$JAVA_HOME_21_X64 \
5970
./gradlew clean :dd-java-agent:shadowJar \
6071
--build-cache --parallel --stacktrace --no-daemon --max-workers=4
72+
6173
- name: Perform CodeQL Analysis and upload results to GitHub Security tab
6274
uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
6375

64-
- name: Upload results to Datadog CI Static Analysis
65-
run: |
66-
wget --no-verbose https://github.com/DataDog/datadog-ci/releases/download/v2.42.0/datadog-ci_linux-x64 -O datadog-ci
67-
chmod +x datadog-ci
68-
./datadog-ci sarif upload /home/runner/work/dd-trace-java/results/java.sarif --service dd-trace-java --env ci
69-
env:
70-
DD_API_KEY: ${{ secrets.DD_API_KEY }}
71-
DD_SITE: datad0g.com
76+
# For now, CodeQL SARIF results are not supported by Datadog CI
77+
# - name: Upload results to Datadog CI Static Analysis
78+
# run: |
79+
# wget --no-verbose https://github.com/DataDog/datadog-ci/releases/download/v2.42.0/datadog-ci_linux-x64 -O datadog-ci
80+
# chmod +x datadog-ci
81+
# ./datadog-ci sarif upload /home/runner/work/dd-trace-java/results/java.sarif --service dd-trace-java --env ci
82+
# env:
83+
# DD_API_KEY: ${{ secrets.DD_API_KEY }}
84+
# DD_SITE: datad0g.com
7285

7386
trivy:
7487
name: Analyze changes with Trivy
@@ -83,6 +96,15 @@ jobs:
8396
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # 4.1.6
8497
with:
8598
submodules: 'recursive'
99+
100+
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
101+
with:
102+
path: |
103+
~/.gradle/caches
104+
~/.gradle/wrapper
105+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
106+
restore-keys: |
107+
${{ runner.os }}-gradle-
86108
87109
- name: Remove old artifacts
88110
run: |

0 commit comments

Comments
 (0)