diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c98f216d5e649ea92bd2f168d26687ff83799ee..2abb5c582f3da1efde3c2d219b28bfc846116f20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ -# [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 diff --git a/README.md b/README.md index 95630063cb3477bd87d407af5871f289e220c2c7..978f73168f4c4e6d72b9a186176c887b177808b6 100644 --- a/README.md +++ b/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: diff --git a/bumpversion.sh b/bumpversion.sh index 329e866dac988c049574a0a9f26ba89979c523a8..708faf434d2459d63b2bdaceada5eb32b0fd39eb 100755 --- a/bumpversion.sh +++ b/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 diff --git a/templates/gitlab-ci-gitleaks.yml b/templates/gitlab-ci-gitleaks.yml index 0ccd5c59eed4c7b3bdf02acc787f3134c74c556e..312ab4880c4c25078f9433446bf95468abcfbf91 100644 --- a/templates/gitlab-ci-gitleaks.yml +++ b/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