Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	.gitlab-ci.yml
#	CHANGELOG.md

CHANGELOG.md

-# [2.6.0](https://git.code.tecnalia.dev/smartdatalab/public/ci-cd-components/gitleaks/compare/2.5.2...2.6.0) (2024-08-29)
+## [2.6.1](https://gitlab.com/to-be-continuous/gitleaks/compare/2.6.0...2.6.1) (2024-09-23)
+
+
+### Bug Fixes
+
+* detect subcommand is now deprecated ([9860a4c](https://gitlab.com/to-be-continuous/gitleaks/commit/9860a4c2d0096ef3e647b2051fd9d2410a0f1a53))
+
+# [2.6.0](https://gitlab.com/to-be-continuous/gitleaks/compare/2.5.2...2.6.0) (2024-07-15)
 
 
 ### Features

README.md

@@ -19,7 +19,7 @@ Add the following to your `.gitlab-ci.yml`:
 ```yaml
 include:
   # 1: include the component
-  - component: $CI_SERVER_FQDN/to-be-continuous/gitleaks/gitlab-ci-gitleaks@2.6.0
+  - component: $CI_SERVER_FQDN/to-be-continuous/gitleaks/gitlab-ci-gitleaks@2.6.1
     # 2: set/override component inputs
     inputs:
       args: "--no-banner" # ⚠ this is only an example
@@ -33,7 +33,7 @@ Add the following to your `.gitlab-ci.yml`:
 include:
   # 1: include the template
   - project: 'to-be-continuous/gitleaks'
-    ref: '2.6.0'
+    ref: '2.6.1'
     file: '/templates/gitlab-ci-gitleaks.yml'
 
 variables:

bumpversion.sh

@@ -27,7 +27,7 @@ if [[ "$curVer" ]]; then
   log_info "Bump version from \\e[33;1m${curVer}\\e[0m to \\e[33;1m${nextVer}\\e[0m (release type: $relType)..."
 
   # replace in README
-  sed -e "s/ref: *'$curVer'/ref: '$nextVer'/" -e "s/ref: *\"$curVer\”/ref: \”$nextVer\”/" -e "s/component: *\(.*\)@$curVer/component: \1@$nextVer/" README.md > README.md.next
+  sed -e "s/ref: *'$curVer'/ref: '$nextVer'/" -e "s/ref: *\"$curVer\"/ref: \"$nextVer\"/" -e "s/component: *\(.*\)@$curVer/component: \1@$nextVer/" README.md > README.md.next
   mv -f README.md.next README.md
 
   # replace in template and variants

templates/gitlab-ci-gitleaks.yml

@@ -230,7 +230,7 @@ gitleaks:
     entrypoint: [""]
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "gitleaks", "2.6.0"]
+      command: ["--service", "gitleaks", "2.6.1"]
   stage: test
   needs: []
   variables:
@@ -241,7 +241,7 @@ gitleaks:
     - install_gitleaks_rules
     - git config --global --add safe.directory "${CI_PROJECT_DIR}"
   script:
-    - gitleaks detect ${TRACE+--log-level debug} --source . $gitleaks_rule_opts --report-path reports/gitleaks.native.json $GITLEAKS_ARGS
+    - gitleaks git ${TRACE+--log-level debug} $gitleaks_rule_opts --report-path reports/gitleaks.native.json $GITLEAKS_ARGS .
   artifacts:
     name: "$CI_JOB_NAME artifacts from $CI_PROJECT_NAME on $CI_COMMIT_REF_SLUG"
     when: always