Skip to content

Commit 5ad4d09

Browse files
Bump gitleaks/gitleaks from 8.18.2 to 8.18.4 (#138)
Bumps [anchore/scan-action](https://github.com/anchore/scan-action) from 3 to 4. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/anchore/scan-action/releases">anchore/scan-action's releases</a>.</em></p> <blockquote> <h2>v4.0.0</h2> <h2>New in scan-action v4.0.0</h2> <ul> <li>Update Grype to v0.79.2 (<a href="https://redirect.github.com/anchore/scan-action/issues/338">#338</a>) [<a href="https://github.com/anchore-actions-token-generator">anchore-actions-token-generator</a>]</li> <li>Download Grype on Windows (<a href="https://redirect.github.com/anchore/scan-action/issues/336">#336</a>) [<a href="https://github.com/willmurphyscode">willmurphyscode</a>] (<a href="https://redirect.github.com/anchore/scan-action/issues/315">#315</a>) [<a href="https://github.com/kzantow">kzantow</a>]</li> <li>Bump Node to v20 (<a href="https://redirect.github.com/anchore/scan-action/issues/295">#295</a>) [<a href="https://github.com/ViacheslavKudinov">ViacheslavKudinov</a>]</li> </ul> <h2>v3.6.4</h2> <h2>New in scan-action v3.6.4</h2> <ul> <li>Update Grype to v0.74.4 (<a href="https://redirect.github.com/anchore/scan-action/issues/279">#279</a>) [<a href="https://github.com/anchore-actions-token-generator">anchore-actions-token-generator</a>]</li> </ul> <h2>v3.6.3</h2> <h2>New in scan-action v3.6.3</h2> <ul> <li>chore: migrate action to use node v20.11.0 (Iron) FROM node v16.x.x (<a href="https://redirect.github.com/anchore/scan-action/issues/278">#278</a>) [<a href="https://github.com/spiffcs">spiffcs</a>]</li> </ul> <h2>v3.6.2</h2> <h2>New in scan-action v3.6.2</h2> <ul> <li>chore(deps): update Grype to v0.74.3 (<a href="https://redirect.github.com/anchore/scan-action/issues/275">#275</a>) [<a href="https://github.com/anchore-actions-token-generator">anchore-actions-token-generator</a>]</li> </ul> <h2>v3.6.1</h2> <h2>New in scan-action v3.6.1</h2> <ul> <li>chore(deps): update Grype to v0.74.2 (<a href="https://redirect.github.com/anchore/scan-action/issues/272">#272</a>) [<a href="https://github.com/anchore-actions-token-generator">anchore-actions-token-generator</a>]</li> <li>chore(deps-dev): bump prettier from 3.2.2 to 3.2.4 (<a href="https://redirect.github.com/anchore/scan-action/issues/270">#270</a>) [<a href="https://github.com/dependabot">dependabot</a>]</li> </ul> <h2>v3.6.0</h2> <h2>New in scan-action v3.6.0</h2> <ul> <li>chore(deps): update Grype to v0.74.1 (<a href="https://redirect.github.com/anchore/scan-action/issues/271">#271</a>) [<a href="https://github.com/anchore-actions-token-generator">anchore-actions-token-generator</a>]</li> <li>chore(deps-dev): bump prettier from 3.1.1 to 3.2.2 (<a href="https://redirect.github.com/anchore/scan-action/issues/268">#268</a>) [<a href="https://github.com/dependabot">dependabot</a>]</li> </ul> <h2>v3.5.0</h2> <h2>New in scan-action v3.5.0</h2> <ul> <li>chore(deps): update Grype to v0.74.0 (<a href="https://redirect.github.com/anchore/scan-action/issues/267">#267</a>) [<a href="https://github.com/anchore-actions-token-generator">anchore-actions-token-generator</a>]</li> <li>chore(deps): bump <code>@​actions/core</code> from 1.10.0 to 1.10.1 (<a href="https://redirect.github.com/anchore/scan-action/issues/262">#262</a>) [<a href="https://github.com/dependabot">dependabot</a>]</li> </ul> <h2>v3.4.0</h2> <h2>New in scan-action v3.4.0</h2> <ul> <li>chore(deps-dev): bump tslib from 2.5.0 to 2.6.2 (<a href="https://redirect.github.com/anchore/scan-action/issues/258">#258</a>) [<a href="https://github.com/dependabot">dependabot</a>]</li> <li>chore(deps-dev): bump <code>@​vercel/ncc</code> from 0.36.1 to 0.38.1 (<a href="https://redirect.github.com/anchore/scan-action/issues/261">#261</a>) [<a href="https://github.com/dependabot">dependabot</a>]</li> <li>chore(deps): update Grype to v0.73.5 (<a href="https://redirect.github.com/anchore/scan-action/issues/264">#264</a>) [<a href="https://github.com/anchore-actions-token-generator">anchore-actions-token-generator</a>]</li> <li>Add support for the <code>--vex</code> flag (<a href="https://redirect.github.com/anchore/scan-action/issues/254">#254</a>) [<a href="https://github.com/ferozsalam">ferozsalam</a>]</li> </ul> <h2>v3.3.8</h2> <h2>New in scan-action v3.3.8</h2> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/anchore/scan-action/blob/main/CHANGELOG.md">anchore/scan-action's changelog</a>.</em></p> <blockquote> <h1>Release Notes</h1> <h2>Version 2.0.2 - 2020-11-11</h2> <ul> <li>Update <code>actions/core</code> to use version <code>1.2.6</code> [(Issue <a href="https://redirect.github.com/anchore/scan-action/issues/71">#71</a>)](<a href="https://redirect.github.com/anchore/scan-action/issues/71">anchore/scan-action#71</a>)</li> </ul> <h2>Version 2.0.1 - 2020-02-11</h2> <p>Fixes:</p> <ul> <li>Removes unnecessary constraint in deduplication for SARIF reporting</li> <li>Allows defining and referencing the location of the SARIF report file</li> <li>Fixes multiple instances where undefined items in the reporting would break scanning</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/anchore/scan-action/commit/d43cc1dfea6a99ed123bf8f3133f1797c9b44492"><code>d43cc1d</code></a> chore(deps): update Grype to v0.79.3 (<a href="https://redirect.github.com/anchore/scan-action/issues/341">#341</a>)</li> <li><a href="https://github.com/anchore/scan-action/commit/a2c96d38ddde62d4a2aa238844733fddd01399c9"><code>a2c96d3</code></a> chore(deps-dev): bump tslib from 2.6.2 to 2.6.3 (<a href="https://redirect.github.com/anchore/scan-action/issues/325">#325</a>)</li> <li><a href="https://github.com/anchore/scan-action/commit/7e49a1e6eaf54c02ecc8c071bd30dbb3beb1bde3"><code>7e49a1e</code></a> chore(deps-dev): bump prettier from 3.3.0 to 3.3.2 (<a href="https://redirect.github.com/anchore/scan-action/issues/327">#327</a>)</li> <li><a href="https://github.com/anchore/scan-action/commit/f207359fdefc9d060383773d27f14bb4a7c09bac"><code>f207359</code></a> chore(deps): bump actions/checkout from 4.1.6 to 4.1.7 (<a href="https://redirect.github.com/anchore/scan-action/issues/330">#330</a>)</li> <li><a href="https://github.com/anchore/scan-action/commit/9b502f28c7dd03ab87931c1eb9a872413868b8b8"><code>9b502f2</code></a> chore(deps-dev): bump lint-staged from 15.2.2 to 15.2.7 (<a href="https://redirect.github.com/anchore/scan-action/issues/329">#329</a>)</li> <li><a href="https://github.com/anchore/scan-action/commit/29a085af3d75de61093ce553ac2dbd8edd2e777b"><code>29a085a</code></a> chore(deps): bump peter-evans/create-pull-request from 6.0.5 to 6.1.0 (<a href="https://redirect.github.com/anchore/scan-action/issues/334">#334</a>)</li> <li><a href="https://github.com/anchore/scan-action/commit/7f46fbf85cadcd374ff60adb2df71eb0d1f41482"><code>7f46fbf</code></a> chore(deps-dev): bump eslint from 8.57.0 to 9.6.0 (<a href="https://redirect.github.com/anchore/scan-action/issues/335">#335</a>)</li> <li><a href="https://github.com/anchore/scan-action/commit/04b73ec0bba3de85519c4ec634bffedead788f96"><code>04b73ec</code></a> chore(deps): update Grype to v0.79.2 (<a href="https://redirect.github.com/anchore/scan-action/issues/338">#338</a>)</li> <li><a href="https://github.com/anchore/scan-action/commit/69a534f9ca3bf6bf67a9ab5614819217766f5e30"><code>69a534f</code></a> fix: download Grype directly on Windows (<a href="https://redirect.github.com/anchore/scan-action/issues/336">#336</a>)</li> <li><a href="https://github.com/anchore/scan-action/commit/d09e278f43e314a93efb4e6000ff0df6153e9333"><code>d09e278</code></a> chore(deps-dev): bump prettier from 3.2.5 to 3.3.0 (<a href="https://redirect.github.com/anchore/scan-action/issues/323">#323</a>)</li> <li>Additional commits viewable in <a href="https://github.com/anchore/scan-action/compare/v3...v4">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=anchore/scan-action&package-manager=github_actions&previous-version=3&new-version=4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: fabasoad <[email protected]>
1 parent 0b332a8 commit 5ad4d09

File tree

7 files changed

+45
-198
lines changed

7 files changed

+45
-198
lines changed

.github/labels.yml

Lines changed: 0 additions & 78 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,6 @@ on: # yamllint disable-line rule:truthy
77
- "v*.*.*"
88

99
jobs:
10-
create-release:
11-
name: Create release
12-
runs-on: ubuntu-latest
13-
steps:
14-
- name: Checkout ${{ github.repository }}
15-
uses: actions/checkout@v4
16-
with:
17-
fetch-depth: 0
18-
- name: Get changelog
19-
id: changelog
20-
uses: simbo/changes-since-last-release-action@v1
21-
- name: Create release
22-
uses: softprops/action-gh-release@v2
23-
with:
24-
tag_name: ${{ github.ref }}
25-
name: ${{ github.ref_name }}
26-
token: ${{ secrets.GITHUB_TOKEN }}
27-
body: |
28-
# Changelog
29-
30-
${{ steps.changelog.outputs.log }}
31-
draft: false
32-
prerelease: false
33-
- name: Bump tags
34-
uses: fischerscode/tagger@v0
35-
with:
36-
prefix: v
10+
github:
11+
name: GitHub
12+
uses: fabasoad/reusable-workflows/.github/workflows/wf-github-release.yml@main

.github/workflows/security.yml

Lines changed: 6 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,45 +7,10 @@ on: # yamllint disable-line rule:truthy
77
branches:
88
- main
99

10-
defaults:
11-
run:
12-
shell: sh
13-
1410
jobs:
15-
code-scanning:
16-
name: Code scanning
17-
runs-on: ubuntu-latest
18-
steps:
19-
- name: Checkout ${{ github.repository }}
20-
uses: actions/checkout@v4
21-
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@v3
23-
with:
24-
languages: "javascript"
25-
- name: Perform CodeQL Analysis
26-
id: codeql-analysis
27-
uses: github/codeql-action/analyze@v3
28-
- name: Upload to GHAS
29-
if: always()
30-
uses: github/codeql-action/upload-sarif@v3
31-
with:
32-
category: "code-scanning"
33-
sarif_file: "${{ steps.codeql-analysis.outputs.sarif-output }}"
34-
directory-scanning:
35-
name: Directory scanning
36-
runs-on: ubuntu-latest
37-
steps:
38-
- name: Checkout ${{ github.repository }}
39-
uses: actions/checkout@v4
40-
- name: Scan current project
41-
id: scan-directory
42-
uses: anchore/scan-action@v3
43-
with:
44-
by-cve: "true"
45-
path: "."
46-
- name: Upload to GHAS
47-
if: always()
48-
uses: github/codeql-action/upload-sarif@v3
49-
with:
50-
category: "directory-scanning"
51-
sarif_file: "${{ steps.scan-directory.outputs.sarif }}"
11+
sast:
12+
name: SAST
13+
permissions:
14+
contents: read
15+
security-events: write
16+
uses: fabasoad/reusable-workflows/.github/workflows/wf-security-sast.yml@main

.github/workflows/sync-labels.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
---
2-
name: Sync labels
2+
name: Labels
33

44
on: # yamllint disable-line rule:truthy
55
push:
66
branches:
77
- main
8-
paths:
9-
- .github/labels.yml
10-
workflow_dispatch:
8+
workflow_dispatch: {}
119

1210
jobs:
13-
sync-labels:
14-
name: Sync labels
15-
runs-on: ubuntu-latest
16-
steps:
17-
- name: Checkout ${{ github.repository }}
18-
uses: actions/checkout@v4
19-
- name: Run Label Syncer
20-
uses: micnncim/action-label-syncer@v1
21-
env:
22-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
11+
maintenance:
12+
name: Maintenance
13+
uses: fabasoad/reusable-workflows/.github/workflows/wf-sync-labels.yml@main
Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,11 @@
11
---
2-
name: Update license
2+
name: License
33

44
on: # yamllint disable-line rule:truthy
55
schedule:
66
- cron: "0 5 1 1 *"
77

88
jobs:
9-
run:
10-
runs-on: ubuntu-latest
11-
steps:
12-
- name: Checkout ${{ github.repository }}
13-
uses: actions/checkout@v4
14-
with:
15-
fetch-depth: 0
16-
- name: Update LICENSE file
17-
uses: FantasticFiasco/action-update-license-year@v3
18-
with:
19-
token: ${{ secrets.GITHUB_TOKEN }}
20-
assignees: ${{ github.repository_owner }}
21-
labels: enhancement
22-
prTitle: Update license copyright year to {{currentYear}}
23-
prBody: |
24-
## Changelog
25-
26-
- Update license copyright year to {{currentYear}}
27-
28-
---
29-
30-
Powered by [FantasticFiasco/action-update-license-year](https://github.com/FantasticFiasco/action-update-license-year)
9+
maintenance:
10+
name: Maintenance
11+
uses: fabasoad/reusable-workflows/.github/workflows/wf-update-license.yml@main

.pre-commit-config.yaml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,34 @@ minimum_pre_commit_version: 2.18.0
55
repos:
66
# Security
77
- repo: https://github.com/Yelp/detect-secrets
8-
rev: v1.4.0
8+
rev: v1.5.0
99
hooks:
1010
- id: detect-secrets
1111
- repo: https://github.com/gitleaks/gitleaks
12-
rev: v8.18.2
12+
rev: v8.18.4
1313
hooks:
1414
- id: gitleaks
15+
- repo: https://github.com/fabasoad/pre-commit-grype
16+
rev: v0.6.0
17+
hooks:
18+
- id: grype-dir
19+
args:
20+
- --grype-args=--by-cve --fail-on=low
21+
- --hook-args=--log-level debug
22+
stages: ["push"]
1523
# Markdown
1624
- repo: https://github.com/igorshubovych/markdownlint-cli
17-
rev: v0.39.0
25+
rev: v0.41.0
1826
hooks:
1927
- id: markdownlint-fix
2028
stages: ["commit"]
2129
# Shell
22-
- repo: https://github.com/shellcheck-py/shellcheck-py
23-
rev: v0.10.0.1
30+
- repo: https://github.com/openstack/bashate
31+
rev: 2.1.1
2432
hooks:
25-
- id: shellcheck
26-
stages: ["push"]
33+
- id: bashate
34+
args: ["-i", "E003,E006"]
35+
stages: ["commit"]
2736
# Yaml
2837
- repo: https://github.com/adrienverge/yamllint
2938
rev: v1.35.1
@@ -32,11 +41,11 @@ repos:
3241
stages: ["push"]
3342
# GitHub Actions
3443
- repo: https://github.com/rhysd/actionlint
35-
rev: v1.6.27
44+
rev: v1.7.1
3645
hooks:
3746
- id: actionlint
3847
args: ["-pyflakes="]
39-
stages: ["push"]
48+
stages: ["commit"]
4049
# Other
4150
- repo: https://github.com/pre-commit/mirrors-prettier
4251
rev: v3.1.0
@@ -46,6 +55,10 @@ repos:
4655
- repo: https://github.com/pre-commit/pre-commit-hooks
4756
rev: v4.6.0
4857
hooks:
58+
- id: check-executables-have-shebangs
59+
stages: ["commit"]
60+
- id: check-shebang-scripts-are-executable
61+
stages: ["commit"]
4962
- id: check-merge-conflict
5063
- id: check-json
5164
stages: ["push"]

action.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@ runs:
2121
exit 1
2222
- name: Collect info
2323
id: info
24-
if: ${{ runner.os == 'Linux' }}
2524
shell: sh
2625
run: |
27-
COBOL_INSTALLED=$(if command -v cobc >/dev/null 2>&1; then echo true; else echo false; fi)
28-
echo "COBOL_INSTALLED=${COBOL_INSTALLED}" >> "$GITHUB_OUTPUT"
26+
cobol_installed=$(if command -v cobc >/dev/null 2>&1; then echo true; else echo false; fi)
27+
echo "cobol-installed=${cobol_installed}" >> "$GITHUB_OUTPUT"
2928
mkdir -p "${GITHUB_WORKSPACE}/cobol"
30-
echo "COBOL_PATH=${GITHUB_WORKSPACE}/cobol" >> "$GITHUB_OUTPUT"
29+
echo "cobol-path=${GITHUB_WORKSPACE}/cobol" >> "$GITHUB_OUTPUT"
3130
- name: Install COBOL
32-
if: ${{ runner.os == 'Linux' && steps.info.outputs.COBOL_INSTALLED == 'false' }}
31+
if: ${{ steps.info.outputs.cobol-installed == 'false' }}
3332
env:
3433
INPUT_VERSION: "${{ inputs.version }}"
3534
shell: sh
@@ -46,4 +45,4 @@ runs:
4645
sudo apt-get -y --purge autoremove
4746
4847
echo "/home/cobol" >> "$GITHUB_PATH"
49-
working-directory: ${{ steps.info.outputs.COBOL_PATH }}
48+
working-directory: ${{ steps.info.outputs.cobol-path }}

0 commit comments

Comments
 (0)