Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump oxsecurity/megalinter from 7.5.0 to 7.7.0 #100

Merged
merged 8 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
FROM ghcr.io/philips-software/amp-devcontainer:v4.0.2@sha256:2d052e0bcb3840ea45aaa21ea6904f6d84b0e310c97e5690a6d48da522ec384e

HEALTHCHECK NONE
4 changes: 1 addition & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
"settings": {
"C_Cpp.autoAddFileAssociations": false,
"C_Cpp.intelliSenseEngine": "disabled",
"clangd.arguments": [
"--query-driver=/**/arm-none-eabi-*"
],
"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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
strategy:
matrix:
configuration: ["RelWithDebInfo"]
gcc: [ "10.3-2021.10" ]
gcc: ["10.3-2021.10"]
target: ["stm32f407", "stm32f767", "stm32f746"]
include:
- gcc: "7-2018-q2"
Expand Down
37 changes: 9 additions & 28 deletions .github/workflows/linting-formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,6 @@ concurrency:
cancel-in-progress: true

jobs:
formatter:
name: Formatting
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
persist-credentials: false
- uses: DoozyX/clang-format-lint-action@11b773b1598aa4ae3b32f023701bca5201c3817d # v0.17
with:
clangFormatVersion: 15
inplace: true
extensions: "cpp,hpp"
- uses: reviewdog/action-suggester@4daff13db10cd0ddb200b45c8c7166dd0d5c85a9 # v1.9.0
with:
tool_name: clang-format
filter_mode: diff_context
linter:
name: Linting
runs-on: ubuntu-latest
Expand All @@ -46,22 +27,22 @@ jobs:
with:
fetch-depth: 0
persist-credentials: false
- uses: oxsecurity/megalinter@b48455a119cc28045eee8f1e9d0a542a85e71f4f # v7.5.0
- uses: oxsecurity/megalinter/flavors/c_cpp@7e042c726c68415475b05a65a686c612120a1232 # v7.7.0
env:
APPLY_FIXES: all
VALIDATE_ALL_CODEBASE: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
#- uses: github/codeql-action/upload-sarif@a34ca99b4610d924e04c68db79e503e1f79f9f02 # v2.1.39
# if: ${{ success() }} || ${{ failure() }}
# with:
# sarif_file: megalinter-reports/megalinter-report.sarif
- run: git diff
- uses: github/codeql-action/upload-sarif@a34ca99b4610d924e04c68db79e503e1f79f9f02 # v3.23.0
if: ${{ success() || failure() }}
with:
sarif_file: megalinter-reports/megalinter-report.sarif
- uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
if: success() || failure()
with:
name: linter
path: |
megalinter-reports
#- uses: reviewdog/action-suggester@4daff13db10cd0ddb200b45c8c7166dd0d5c85a9 # v1.9.0
# with:
# tool_name: MegaLinter
# filter_mode: diff_context
- uses: reviewdog/action-suggester@4daff13db10cd0ddb200b45c8c7166dd0d5c85a9 # v1.9.0
with:
tool_name: MegaLinter
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
.vs/
.vscode/.cortex-debug.registers.state.json
[Bb]uild/
megalinter-reports/
out/
12 changes: 10 additions & 2 deletions .mega-linter.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
---
ENABLE:
- ACTION
- CPP
- DOCKERFILE
- JSON
- MARKDOWN
- REPOSITORY
- SPELL
- XML
- YAML
DISABLE_LINTERS:
- JSON_JSONLINT
- CPP_CPPLINT
- REPOSITORY_DEVSKIM
- REPOSITORY_GITLEAKS
- REPOSITORY_KICS
- REPOSITORY_SEMGREP
- SPELL_CSPELL
- JSON_V8R
DISABLE_ERRORS_LINTERS:
- MARKDOWN_MARKDOWN_LINK_CHECK
- SPELL_PROSELINT
- SPELL_LYCHEE
SPELL_PROSELINT_FILE_EXTENSIONS: [".md", ".adoc"]
SARIF_REPORTER: true
PRINT_ALPACA: false
FLAVOR_SUGGESTIONS: false
SHOW_SKIPPED_LINTERS: false
JSON_JSONLINT_ARGUMENTS: --mode cjson
3 changes: 3 additions & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0002/
# We allow root access in our container that we use for development purposes
DS002
8 changes: 0 additions & 8 deletions .vscode/extensions.json

This file was deleted.

8 changes: 0 additions & 8 deletions .vscode/settings.json

This file was deleted.

6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ There is currently no offial code of conduct, follow general Philips guidelines

At Philips, we use two different contribution models, OSS and Github.
Learn more about the [contribution models here.](https://confluence.atlas.philips.com/display/GITHUB/Contribution+Models)
This project uses the [OSS Model.](#OSS-Model)
This project uses the [OSS Model.](#oss-model)

### Got a Question or Problem?

Expand All @@ -57,7 +57,7 @@ If you find a bug in the source code or a mistake in the documentation, you can

### Found a security vulnerability?

If you discover a vulnerability in our software, please contact a [maintainer](CODEOWNERS) directly and report it appropriately.
If you discover a vulnerability in our software, please contact a [maintainer](.github/CODEOWNERS) directly and report it appropriately.
Do not submit an issue, unless asked to.

### Missing a Feature?
Expand Down Expand Up @@ -94,7 +94,7 @@ You can file new issues by selecting from our new issue templates and filling ou
### Submitting a Pull Request (PR)

Depending on what [contribution model](#learn-about-our-contribution-models) is chosen, instructions are different on how to submit a Pull Request.
This project uses the [OSS-Model](#OSS-Model).
This project uses the [OSS-Model](#oss-model).

#### OSS Model

Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<div align="center">

# amp-preview (Possibly Real-time Embedded Views)

<!-- markdownlint-disable -->
<div align="center">

[![Continuous Integration](https://github.com/philips-software/amp-preview/workflows/Continuous%20Integration/badge.svg)](https://github.com/philips-software/amp-preview/actions) [![Linting & Formatting](https://github.com/philips-software/amp-preview/actions/workflows/linting-formatting.yml/badge.svg)](https://github.com/philips-software/amp-preview/actions/workflows/linting-formatting.yml) [![Static Analysis](https://github.com/philips-software/amp-preview/actions/workflows/static-analysis.yml/badge.svg)](https://github.com/philips-software/amp-preview/actions/workflows/static-analysis.yml)

[![License: MIT](https://img.shields.io/badge/License-MIT-brightgreen.svg)](https://choosealicense.com/licenses/mit/)

</div>
<!-- markdownlint enable -->

**Description**: amp-preview is a C++ framework for creating embedded user interfaces.

Expand Down Expand Up @@ -53,4 +55,4 @@ Please refer to our [Contributing](CONTRIBUTING.md) guide when you want to contr

## License

amp-preview is licenced under the [MIT](https://choosealicense.com/licenses/mit/) license. See [LICENSE file](LICENSE.md).
amp-preview is licenced under the [MIT](https://choosealicense.com/licenses/mit/) license. See [LICENSE file](LICENSE).
3 changes: 2 additions & 1 deletion preview/stm32fxxx/BitmapPainterStm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ namespace hal
void BitmapPainterStm::WaitUntilDrawingFinished() const
{
while ((DMA2D->CR & DMA2D_CR_START) != RESET)
{}
{
}
}

void BitmapPainterStm::DrawHorizontalLine(infra::Bitmap& bitmap, infra::Point from, uint16_t deltaX, infra::Colour colour)
Expand Down
6 changes: 2 additions & 4 deletions release-please-config.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
{
"include-component-in-tag": false,
"plugins": [ "sentence-case" ],
"plugins": ["sentence-case"],
"packages": {
".": {
"release-type": "simple",
"package-name": "amp-preview",
"extra-files": [
"CMakeLists.txt"
]
"extra-files": ["CMakeLists.txt"]
}
},
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
Expand Down
Loading