Skip to content

Commit 2796205

Browse files
authored
Merge branch 'main' into feature/AB#1026894-cmake-option-for-disabling-fetch-extern
2 parents 7622821 + a8ba3f7 commit 2796205

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
container: ghcr.io/philips-software/amp-devcontainer-cpp:5.6.2@sha256:a0804f7454d52564f07317f7e09a012261b6d9553dbe8854fcf265dce571cf86 # v5.6.2
2828
steps:
2929
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
30-
- uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
30+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
3131
id: cache-winsdk
3232
with:
3333
path: /winsdk
@@ -62,7 +62,7 @@ jobs:
6262
configurePresetAdditionalArgs: "['-DCMAKE_C_COMPILER_LAUNCHER=ccache', '-DCMAKE_CXX_COMPILER_LAUNCHER=ccache']"
6363
- name: Upload test logs
6464
if: ${{ failure() }}
65-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
65+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
6666
with:
6767
name: test-logs
6868
path: build/Host/Testing/Temporary/
@@ -85,7 +85,7 @@ jobs:
8585
configurePresetAdditionalArgs: "['-DCMAKE_C_COMPILER_LAUNCHER=ccache', '-DCMAKE_CXX_COMPILER_LAUNCHER=ccache']"
8686
- name: Upload test logs
8787
if: ${{ failure() }}
88-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
88+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
8989
with:
9090
name: test-logs
9191
path: build/Host/Testing/Temporary/
@@ -140,7 +140,7 @@ jobs:
140140
configurePresetAdditionalArgs: "['-DCMAKE_C_COMPILER_LAUNCHER=sccache', '-DCMAKE_CXX_COMPILER_LAUNCHER=sccache']"
141141
- name: Upload test logs
142142
if: ${{ failure() }}
143-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
143+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
144144
with:
145145
name: test-logs
146146
path: build/host-single-Dbebug/Testing/Temporary/

.github/workflows/linting-formatting.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@ jobs:
2626
with:
2727
fetch-depth: 0
2828
persist-credentials: false
29-
- uses: oxsecurity/megalinter/flavors/c_cpp@ec124f7998718d79379a3c5b39f5359952baf21d # v8.4.2
29+
- uses: oxsecurity/megalinter/flavors/c_cpp@146333030da68e2e58c6ff826633824fabe01eaf # v8.5.0
3030
env:
3131
APPLY_FIXES: all
3232
VALIDATE_ALL_CODEBASE: true
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3434
- run: git diff
35-
- uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
35+
- uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
3636
if: ${{ success() || failure() }}
3737
with:
3838
sarif_file: megalinter-reports/megalinter-report.sarif
39-
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
39+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4040
if: ${{ success() || failure() }}
4141
with:
4242
name: linter
4343
path: |
4444
megalinter-reports
45-
- uses: reviewdog/action-suggester@a3026c6020837c23b61a79d12db223a00df19e6a # v1.19.0
45+
- uses: reviewdog/action-suggester@4747dbc9f9e37adba0943e681cc20db466642158 # v1.19.0
4646
with:
4747
tool_name: MegaLinter

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
name: Create Release
2020
runs-on: [ubuntu-latest]
2121
steps:
22-
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
22+
- uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1.12.0
2323
id: token
2424
with:
2525
app-id: ${{ vars.FOREST_RELEASER_APP_ID }}

.github/workflows/security.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ jobs:
3131
results_format: sarif
3232
repo_token: ${{ secrets.SCORECARD_READ_TOKEN }}
3333
publish_results: true
34-
- uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
34+
- uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
3535
with:
3636
sarif_file: scorecards.sarif

.github/workflows/static-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
run: |
5757
cp .build/Coverage/compile_commands.json compile_commands.json
5858
59-
- uses: sonarsource/sonarqube-scan-action@0303d6b62e310685c0e34d0b9cde218036885c4d # v5.0.0
59+
- uses: sonarsource/sonarqube-scan-action@aa494459d7c39c106cc77b166de8b4250a32bb97 # v5.1.0
6060
env:
6161
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
6262

@@ -73,12 +73,12 @@ jobs:
7373
- uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
7474
with:
7575
key: ${{ github.job }}
76-
- uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
76+
- uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
7777
with:
7878
languages: cpp
7979
- uses: lukka/run-cmake@af1be47fd7c933593f687731bc6fdbee024d3ff4 # v10.8
8080
with:
8181
configurePreset: "Host"
8282
buildPreset: "Host-Debug"
8383
configurePresetAdditionalArgs: "['-DCMAKE_C_COMPILER_LAUNCHER=ccache', '-DCMAKE_CXX_COMPILER_LAUNCHER=ccache']"
84-
- uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
84+
- uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13

external/nlohmann/json/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FetchContent_Declare(nlohmann_json
22
GIT_REPOSITORY https://github.com/nlohmann/json.git
3-
GIT_TAG "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d" # v3.11.2
3+
GIT_TAG "79587f896ed4db2a0b63baa9151113f4da336599" # Unreleased
44

55
OVERRIDE_FIND_PACKAGE
66
)

0 commit comments

Comments
 (0)