Skip to content

Commit

Permalink
chore: update amp-devcontainer from v2.5.0 to v4.0.2 (#92)
Browse files Browse the repository at this point in the history
* refactor: fix more Sonar findings

* chore: update amp-devcontainer from v2.5.0 to v4.0.2

* chore: remove duplicate codeql/analyze

* Update .devcontainer/devcontainer.json

Co-authored-by: EkelmansPh <[email protected]>

* chore: fix action merge issue

---------

Co-authored-by: EkelmansPh <[email protected]>
  • Loading branch information
rjaegers and EkelmansPh authored Jan 16, 2024
1 parent b5810b2 commit ce1c374
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 16 deletions.
1 change: 1 addition & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM ghcr.io/philips-software/amp-devcontainer:v4.0.2@sha256:2d052e0bcb3840ea45aaa21ea6904f6d84b0e310c97e5690a6d48da522ec384e
39 changes: 29 additions & 10 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,37 @@
{
// This devcontainer has been set-up to run docker-from-docker scenarios as per
// https://github.com/microsoft/vscode-dev-containers/tree/main/containers/docker-from-docker
"name": "amp-devcontainer",
"image": "ghcr.io/philips-software/amp-devcontainer:2.2.0",
"runArgs": [ "--add-host=host.docker.internal:host-gateway" ],
"build": {
"context": "..",
"dockerfile": "Dockerfile"
},
"runArgs": ["--add-host=host.docker.internal:host-gateway"],
"remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" },
"mounts": [
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
],
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"marus25.cortex-debug",
"matepek.vscode-catch2-test-adapter",
"ms-vscode.cmake-tools",
"SonarSource.sonarlint-vscode"
]
"customizations": {
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"marus25.cortex-debug",
"matepek.vscode-catch2-test-adapter",
"mhutchie.git-graph",
"ms-vscode.cmake-tools",
"ms-vscode.cpptools",
"ms-vsliveshare.vsliveshare",
"SonarSource.sonarlint-vscode"
],
"settings": {
"C_Cpp.autoAddFileAssociations": false,
"C_Cpp.intelliSenseEngine": "disabled",
"clangd.arguments": [
"--query-driver=/**/arm-none-eabi-*"
],
"cmake.copyCompileCommands": "${workspaceFolder}/build/compile_commands.json",
"cmake.options.statusBarVisibility": "compact",
"sonarlint.pathToCompileCommands": "${workspaceFolder}/build/compile_commands.json"
}
}
}
}
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ updates:
directory: /
schedule:
interval: daily
- package-ecosystem: docker
directory: /
schedule:
interval: daily
13 changes: 7 additions & 6 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
sonar:
name: SonarCloud
runs-on: ubuntu-latest
container: ghcr.io/philips-software/amp-devcontainer:2.5.0
container: ghcr.io/philips-software/amp-devcontainer:v4.0.2@sha256:2d052e0bcb3840ea45aaa21ea6904f6d84b0e310c97e5690a6d48da522ec384e
env:
SONAR_SCANNER_VERSION: 5.0.1.3006
SONAR_SERVER_URL: "https://sonarcloud.io"
Expand Down Expand Up @@ -57,21 +57,22 @@ jobs:
codeql:
name: CodeQL
runs-on: ubuntu-latest
container: ghcr.io/philips-software/amp-devcontainer:v4.0.2@sha256:2d052e0bcb3840ea45aaa21ea6904f6d84b0e310c97e5690a6d48da522ec384e
permissions:
security-events: write
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
persist-credentials: false
- run: sudo apt-get update && sudo apt-get install ninja-build
- uses: hendrikmuhs/ccache-action@2a51777f6f64b7b7bea213601acba8f5f4fdbe03 # v1.2.11
with:
key: ${{ github.job }}
- uses: github/codeql-action/init@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
with:
languages: cpp
- run: |
cmake --preset continuous-integration -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
cmake --build --preset continuous-integration
- uses: lukka/run-cmake@2ce8982be71b8e9a3c4d5e432135035afd1e76a7 # v10.7
with:
configurePreset: "continuous-integration"
buildPreset: "continuous-integration"
configurePresetAdditionalArgs: "['-DCMAKE_C_COMPILER_LAUNCHER=ccache', '-DCMAKE_CXX_COMPILER_LAUNCHER=ccache']"
- uses: github/codeql-action/analyze@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0

1 change: 1 addition & 0 deletions .mega-linter.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
ENABLE:
- ACTION
- DOCKERFILE
Expand Down

0 comments on commit ce1c374

Please sign in to comment.