Skip to content

Commit cab172a

Browse files
authored
docs: update Macaron Action version (#1386)
Bumps Macaron GitHub Action to v0.24.0 and update the docs. We also ignore GHSA-58qw-9mgm-455v for now until a patch is available. Signed-off-by: behnazh-w <behnaz.hassanshahi@oracle.com>
1 parent 4ddb55e commit cab172a

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

.github/workflows/macaron-analysis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
# Note: adjust the policy_purl to refer to your repository URL.
3636
- name: Run Macaron action
3737
id: run_macaron
38-
uses: oracle/macaron@b31acfe389133a5587d9639063ec70cb84e7bc47 # v0.23.0
38+
uses: oracle/macaron@4ddb55e3c9ef2c77b548be55c557078c4476fd9c # v0.24.0
3939
with:
4040
repo_path: ./
4141
policy_file: check-github-actions

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,12 +304,15 @@ requirements.txt: pyproject.toml
304304
# Remove GHSA-vfmq-68hx-4jfw when the following issue is resolved to be able to
305305
# install the latest version of lxml.
306306
# https://github.com/semgrep/semgrep/issues/11630
307+
#
308+
# Remove GHSA-58qw-9mgm-455v once a patch is available.
309+
# https://github.com/advisories/GHSA-58qw-9mgm-455v
307310
.PHONY: audit
308311
audit:
309312
if ! $$(python -c "import pip_audit" &> /dev/null); then \
310313
echo "No package pip_audit installed, upgrade your environment!" && exit 1; \
311314
fi;
312-
python -m pip_audit --skip-editable --desc on --fix --dry-run --ignore-vuln GHSA-vfmq-68hx-4jfw
315+
python -m pip_audit --skip-editable --desc on --fix --dry-run --ignore-vuln GHSA-vfmq-68hx-4jfw --ignore-vuln GHSA-58qw-9mgm-455v
313316

314317
# Run some or all checks over the package code base.
315318
.PHONY: check check-code check-bandit check-flake8 check-lint check-mypy check-go check-actionlint

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@ Use Macaron as a GitHub Action
1414
To use the Macaron GitHub Action, add the following step to your workflow (adjust the version as needed). In this example, we use an example policy. For detailed instructions and a comprehensive list of available options, please refer to the [Macaron GitHub Action documentation](https://oracle.github.io/macaron/pages/macaron_action.html).
1515

1616
```yaml
17-
- uses: oracle/macaron@b31acfe389133a5587d9639063ec70cb84e7bc47 # v0.23.0
17+
- uses: oracle/macaron@4ddb55e3c9ef2c77b548be55c557078c4476fd9c # v0.24.0
1818
with:
19-
repo_path: 'https://github.com/example/project'
19+
repo_path: ./
2020
policy_file: check-github-actions
2121
policy_purl: 'pkg:github.com/example/project@.*'
2222
output_dir: 'macaron-output'
23-
upload_attestation: true
2423
```
2524
2625
For detailed instructions and a comprehensive list of available options, please refer to the [Macaron GitHub Action documentation](https://oracle.github.io/macaron/pages/macaron_action.html).

docs/source/pages/macaron_action.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ When you use this action, you can reference it directly in your workflow. For a
2424
steps:
2525
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2626
- name: Run Macaron Security Analysis Action
27-
uses: oracle/macaron@b31acfe389133a5587d9639063ec70cb84e7bc47 # v0.23.0
27+
uses: oracle/macaron@4ddb55e3c9ef2c77b548be55c557078c4476fd9c # v0.24.0
2828
with:
2929
repo_path: ./
3030
policy_file: check-github-actions

0 commit comments

Comments
 (0)