Skip to content

Commit

Permalink
Merge branch 'feat/manifest_check_v4.4' into 'release/v4.4'
Browse files Browse the repository at this point in the history
feat: use esp-idf-sbom pre-commit plugin (v4.4)

See merge request espressif/esp-idf!27755
  • Loading branch information
dobairoland committed Dec 8, 2023
2 parents ce2102e + 22637ff commit 2c9fa27
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 92 deletions.
7 changes: 0 additions & 7 deletions .gitlab/ci/host-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -281,13 +281,6 @@ test_mkuf2:
- cd ${IDF_PATH}/tools/test_mkuf2
- ./test_mkuf2.py

test_sbom:
extends:
- .host_test_template
- .rules:patterns:sbom
script:
- python ${IDF_PATH}/tools/test_sbom/test_submodules.py

test_autocomplete:
extends: .host_test_template
image: $CI_DOCKER_REGISTRY/linux-shells:1
Expand Down
11 changes: 0 additions & 11 deletions .gitlab/ci/rules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@
- "tools/tools.json"
- "tools/ci/test_build_system*.sh"

.patterns-sbom: &patterns-sbom
- "tools/test_sbom/*"

.patterns-custom_test: &patterns-custom_test
- "tools/ci/python_packages/gitlab_api.py"
- "tools/ci/python_packages/tiny_test_fw/**/*"
Expand Down Expand Up @@ -257,14 +254,6 @@
- <<: *if-dev-push
changes: *patterns-sonarqube-files

.rules:patterns:sbom:
rules:
- <<: *if-protected
- <<: *if-dev-push
changes: *patterns-sbom
- <<: *if-dev-push
changes: *patterns-submodule

# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# DO NOT place comments or maintain any code from this line
#
Expand Down
4 changes: 4 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,7 @@ repos:
hooks:
- id: file-contents-sorter
files: 'tools\/ci\/(executable-list\.txt|mypy_ignore_list\.txt)'
- repo: https://github.com/espressif/esp-idf-sbom.git
rev: v0.11.0
hooks:
- id: validate-sbom-manifest
74 changes: 0 additions & 74 deletions tools/test_sbom/test_submodules.py

This file was deleted.

0 comments on commit 2c9fa27

Please sign in to comment.