mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 16:35:02 +01:00
Merge Revert "gitlab: testing: temporarily disable secret-detect"
It appears secret detection is failing if the master branch in the tree a merge request is being made from is too (some unknown value) far behind the branch of the tree it is being merged into.
This is problematic as it is not started practice to refresh the upstream branches of forked trees, but to keep multiple remotes in a single local tree, branch from mainline master, work on the branch and push to the fork for the merge request. This will require contributors to refresh their forked trees in secret-detection fails. Which may be problematic for some contributors, but since we don't know how bad this is going to be, for now re-enable secret detection.
This reverts commit 8b4344c17b
.
MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/854
Approved-by: Christian Boltz <apparmor@cboltz.de>
Merged-by: John Johansen <john@jjmx.net>
This commit is contained in:
commit
40402e2436
1 changed files with 1 additions and 5 deletions
|
@ -131,11 +131,7 @@ shellcheck:
|
|||
|
||||
include:
|
||||
- template: SAST.gitlab-ci.yml
|
||||
# Temporarily disable secret-detection because it is failing with
|
||||
# fatal: error in object: unshallow sha1
|
||||
# and none of the suggested work-arounds work
|
||||
# see https://gitlab.com/gitlab-org/gitlab/-/issues/351976
|
||||
# - template: Secret-Detection.gitlab-ci.yml
|
||||
- template: Secret-Detection.gitlab-ci.yml
|
||||
|
||||
variables:
|
||||
SAST_EXCLUDED_ANALYZERS: "eslint,flawfinder,semgrep,spotbugs"
|
||||
|
|
Loading…
Add table
Reference in a new issue