Skip to content

Commit 862a4a2

Browse files
committed
Merge remote-tracking branch 'origin/master' into dependabot/github_actions/actions/checkout-4.1.1
2 parents c88d77e + f06ed1e commit 862a4a2

File tree

4 files changed

+25
-8
lines changed

4 files changed

+25
-8
lines changed

.github/workflows/check_documentation.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches: master
88

99
permissions:
10-
contents: read
10+
contents: write
1111

1212
jobs:
1313
documentationjob:

.github/workflows/codeql.yml

+20-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
steps:
4343
- name: Free Disk Space (Ubuntu)
44-
uses: jlumbroso/free-disk-space@main
44+
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # main
4545
with:
4646
# this might remove tools that are actually needed,
4747
# if set to "true" but frees about 6 GB
@@ -69,7 +69,7 @@ jobs:
6969

7070
# Initializes the CodeQL tools for scanning.
7171
- name: Initialize CodeQL
72-
uses: github/codeql-action/init@8b7fcbfac2aae0e6c24d9f9ebd5830b1290b18e4 # v2.23.0
72+
uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
7373
with:
7474
languages: ${{ matrix.language }}
7575
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -94,6 +94,23 @@ jobs:
9494
colcon build --event-handlers console_direct+ --executor sequential --packages-up-to ad_rss ad_rss_map_integration --cmake-args -DBUILD_HARDENING=ON -DBUILD_TESTING=ON -DBUILD_PYTHON_BINDING=ON
9595
9696
- name: Perform CodeQL Analysis
97-
uses: github/codeql-action/analyze@8b7fcbfac2aae0e6c24d9f9ebd5830b1290b18e4 # v2.23.0
97+
uses: github/codeql-action/analyze@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
9898
with:
99+
upload: false # disable the upload here - we will upload in a different action
99100
category: "/language:${{matrix.language}}"
101+
output: sarif-results
102+
103+
- name: filter-sarif
104+
uses: advanced-security/filter-sarif@f3b8118a9349d88f7b1c0c488476411145b6270d # v1.0.1
105+
with:
106+
# filter out all dependencies of map
107+
patterns: |
108+
-dependencies/map/dependencies/**/*
109+
input: sarif-results/${{ matrix.language }}.sarif
110+
output: sarif-results/${{ matrix.language }}.sarif
111+
112+
- name: Upload SARIF
113+
uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
114+
with:
115+
sarif_file: sarif-results/${{ matrix.language }}.sarif
116+

.github/workflows/dependency-review.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
- name: 'Checkout Repository'
2525
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2626
- name: 'Dependency Review'
27-
uses: actions/dependency-review-action@c74b580d73376b7750d3d2a50bfb8adc2c937507 # v3.1.5
27+
uses: actions/dependency-review-action@4901385134134e04cec5fbe5ddfe3b2c5bd5d976 # v4.0.0

.github/workflows/scorecards.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
persist-credentials: false
4242

4343
- name: "Run analysis"
44-
uses: ossf/scorecard-action@99c53751e09b9529366343771cc321ec74e9bd3d # v2.0.6
44+
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
4545
with:
4646
results_file: results.sarif
4747
results_format: sarif
@@ -63,14 +63,14 @@ jobs:
6363
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6464
# format to the repository Actions tab.
6565
- name: "Upload artifact"
66-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
66+
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
6767
with:
6868
name: SARIF file
6969
path: results.sarif
7070
retention-days: 5
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@8b7fcbfac2aae0e6c24d9f9ebd5830b1290b18e4 # v2.23.0
74+
uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
7575
with:
7676
sarif_file: results.sarif

0 commit comments

Comments
 (0)