Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/nuget/czishrink/czishrink-22c529c319
Browse files Browse the repository at this point in the history
  • Loading branch information
m-ringler authored Sep 18, 2024
2 parents a47b8a3 + ddde59b commit b648393
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/dependency-review.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ jobs:
uses: actions/dependency-review-action@v4
with:
# Add more licenses as required. Do not add copy-left licenses or licenses incompatible with MIT (for czicompress) and GPL-3.0-or-later (for czishrink)
allow-licenses: MIT, MIT-0, Apache-2.0, BSD-2-Clause, BSD-3-Clause
# AGPL-3.0 is for megalinter which is not shipped (only used in CI/CD)
allow-licenses: MIT, MIT-0, Apache-2.0, BSD-2-Clause, BSD-3-Clause, AGPL-3.0
2 changes: 1 addition & 1 deletion .github/workflows/mega-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
id: ml
# You can override MegaLinter flavor used to have faster performances
# More info at https://megalinter.io/flavors/
uses: oxsecurity/megalinter/flavors/dotnet@v7
uses: oxsecurity/megalinter/flavors/dotnet@v8
env:
# All available variables are described in documentation
# https://megalinter.io/configuration/
Expand Down

0 comments on commit b648393

Please sign in to comment.