Skip to content

Commit deb6807

Browse files
committed
sync: update 3 files from source repository
1 parent 5e99207 commit deb6807

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

.github/.env.base

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ GO_COVERAGE_PROVIDER=internal
147147
CODECOV_TOKEN_REQUIRED=false
148148

149149
# Go Coverage Tool Version
150-
GO_COVERAGE_VERSION=v1.1.12 # https://github.com/mrz1836/go-coverage
150+
GO_COVERAGE_VERSION=v1.1.13 # https://github.com/mrz1836/go-coverage/releases
151151
GO_COVERAGE_USE_LOCAL=false # Use local version for development
152152

153153
# Core Coverage Settings
@@ -232,12 +232,12 @@ REDIS_CACHE_FORCE_PULL=false # Force pull Redis images even when cache
232232
# 🪄 MAGE-X CONFIGURATION
233233
# ================================================================================================
234234

235-
MAGE_X_VERSION=v1.7.12 # https://github.com/mrz1836/mage-x/releases
235+
MAGE_X_VERSION=v1.7.13 # https://github.com/mrz1836/mage-x/releases
236236
MAGE_X_USE_LOCAL=false # Use local version for development
237237
MAGE_X_AUTO_DISCOVER_BUILD_TAGS=true # Enable auto-discovery of build tags
238238
MAGE_X_AUTO_DISCOVER_BUILD_TAGS_EXCLUDE=race,custom # Comma-separated list of tags to exclude
239239
MAGE_X_FORMAT_EXCLUDE_PATHS=vendor,node_modules,.git,.idea # Format exclusion paths (comma-separated directories to exclude from formatting)
240-
MAGE_X_GITLEAKS_VERSION=8.28.0 # https://github.com/gitleaks/gitleaks/releases
240+
MAGE_X_GITLEAKS_VERSION=8.29.0 # https://github.com/gitleaks/gitleaks/releases
241241
MAGE_X_GOFUMPT_VERSION=v0.9.2 # https://github.com/mvdan/gofumpt/releases
242242
MAGE_X_GOLANGCI_LINT_VERSION=v2.6.1 # https://github.com/golangci/golangci-lint/releases
243243
MAGE_X_GORELEASER_VERSION=v2.12.7 # https://github.com/goreleaser/goreleaser/releases
@@ -291,7 +291,7 @@ NANCY_EXCLUDES=CVE-2024-38513,CVE-2023-45142
291291
# Github Secret(s): OSSI_USERNAME and OSSI_TOKEN
292292

293293
# Security Tools
294-
GITLEAKS_VERSION=8.28.0 # https://github.com/gitleaks/gitleaks/releases
294+
GITLEAKS_VERSION=8.29.0 # https://github.com/gitleaks/gitleaks/releases
295295
GOVULNCHECK_VERSION=v1.1.4 # https://pkg.go.dev/golang.org/x/vuln
296296
NANCY_VERSION=v1.0.51 # https://github.com/sonatype-nexus-community/nancy/releases
297297

@@ -300,7 +300,7 @@ NANCY_VERSION=v1.0.51 # https://github.com/sonatype-nexus-commu
300300
# ================================================================================================
301301

302302
# Pre-Commit System
303-
GO_PRE_COMMIT_VERSION=v1.3.5 # https://github.com/mrz1836/go-pre-commit
303+
GO_PRE_COMMIT_VERSION=v1.4.1 # https://github.com/mrz1836/go-pre-commit/releases
304304
GO_PRE_COMMIT_USE_LOCAL=false # Use local version for development
305305

306306
# System Settings
@@ -322,6 +322,7 @@ GO_PRE_COMMIT_ALL_FILES=true
322322
GO_PRE_COMMIT_GOLANGCI_LINT_VERSION=v2.6.1 # https://github.com/golangci/golangci-lint/releases
323323
GO_PRE_COMMIT_FUMPT_VERSION=v0.9.2 # https://github.com/mvdan/gofumpt/releases
324324
GO_PRE_COMMIT_GOIMPORTS_VERSION=latest # https://github.com/golang/tools
325+
GO_PRE_COMMIT_GITLEAKS_VERSION=v8.29.0 # https://github.com/gitleaks/gitleaks/releases
325326

326327
# Build tags for golangci-lint and other tools
327328
GO_PRE_COMMIT_BUILD_TAGS=
@@ -335,6 +336,8 @@ GO_PRE_COMMIT_ENABLE_MOD_TIDY=true
335336
GO_PRE_COMMIT_ENABLE_WHITESPACE=true
336337
GO_PRE_COMMIT_ENABLE_EOF=true
337338
GO_PRE_COMMIT_ENABLE_AI_DETECTION=true
339+
GO_PRE_COMMIT_ENABLE_GITLEAKS=true
340+
GO_PRE_COMMIT_GITLEAKS_ALL_FILES=false
338341

339342
# Auto-staging Settings
340343
GO_PRE_COMMIT_FMT_AUTO_STAGE=true
@@ -353,6 +356,7 @@ GO_PRE_COMMIT_MOD_TIDY_TIMEOUT=60
353356
GO_PRE_COMMIT_WHITESPACE_TIMEOUT=30
354357
GO_PRE_COMMIT_EOF_TIMEOUT=30
355358
GO_PRE_COMMIT_AI_DETECTION_TIMEOUT=30
359+
GO_PRE_COMMIT_GITLEAKS_TIMEOUT=60
356360

357361
# Path Configuration
358362
GO_PRE_COMMIT_HOOKS_PATH=.git/hooks

.github/workflows/fortress-pre-commit.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
with:
140140
path: |
141141
~/.cache/go-pre-commit-tools
142-
key: ${{ inputs.primary-runner }}-go-pre-commit-tools-golangci-${{ env.GO_PRE_COMMIT_GOLANGCI_LINT_VERSION }}-fumpt-${{ env.GO_PRE_COMMIT_FUMPT_VERSION }}
142+
key: ${{ inputs.primary-runner }}-go-pre-commit-tools-golangci-${{ env.GO_PRE_COMMIT_GOLANGCI_LINT_VERSION }}-fumpt-${{ env.GO_PRE_COMMIT_FUMPT_VERSION }}-gitleaks-${{ env.GO_PRE_COMMIT_GITLEAKS_VERSION }}-goimports-${{ env.GO_PRE_COMMIT_GOIMPORTS_VERSION }}
143143

144144
- name: 🛠️ Make cached go-pre-commit and tools usable
145145
if: env.GO_PRE_COMMIT_USE_LOCAL != 'true'
@@ -256,20 +256,22 @@ jobs:
256256
echo ""
257257
echo "🔧 Tool Versions:"
258258
echo " • Max File Size: ${{ env.GO_PRE_COMMIT_MAX_FILE_SIZE_MB }} MB"
259-
echo " • golangci-lint: ${{ env.GO_PRE_COMMIT_GOLANGCI_LINT_VERSION }}"
259+
echo " • gitleaks: ${{ env.GO_PRE_COMMIT_GITLEAKS_VERSION }}"
260260
echo " • gofumpt: ${{ env.GO_PRE_COMMIT_FUMPT_VERSION }}"
261261
echo " • goimports: ${{ env.GO_PRE_COMMIT_GOIMPORTS_VERSION }}"
262+
echo " • golangci-lint: ${{ env.GO_PRE_COMMIT_GOLANGCI_LINT_VERSION }}"
262263
echo ""
263264
echo "📁 Configuration:"
264265
echo " • Exclude Patterns: ${{ env.GO_PRE_COMMIT_EXCLUDE_PATTERNS }}"
265266
echo " • Color Output: ${{ env.GO_PRE_COMMIT_COLOR_OUTPUT }}"
266267
echo ""
267268
echo "🔧 Individual Checks:"
269+
echo " • eof: ${{ env.GO_PRE_COMMIT_ENABLE_EOF }}"
268270
echo " • fumpt: ${{ env.GO_PRE_COMMIT_ENABLE_FUMPT }}"
271+
echo " • gitleaks: ${{ env.GO_PRE_COMMIT_ENABLE_GITLEAKS }}"
269272
echo " • lint: ${{ env.GO_PRE_COMMIT_ENABLE_LINT }}"
270273
echo " • mod-tidy: ${{ env.GO_PRE_COMMIT_ENABLE_MOD_TIDY }}"
271274
echo " • whitespace: ${{ env.GO_PRE_COMMIT_ENABLE_WHITESPACE }}"
272-
echo " • eof: ${{ env.GO_PRE_COMMIT_ENABLE_EOF }}"
273275
echo ""
274276
echo "=================================================="
275277
@@ -622,20 +624,16 @@ jobs:
622624
fi
623625
624626
# Clean and filter output (colors should be disabled but handle any remaining codes)
625-
# Remove any remaining ANSI codes and filter redundant summary lines
627+
# Remove any remaining ANSI codes but preserve all check results
626628
echo "$CHECKS_OUTPUT" | \
627629
sed -E 's/\x1b\[[0-9;]*[mGKH]//g' | \
628630
sed 's/\xc2\x9b\[[0-9;]*[mGKH]//g' | \
629631
sed 's/�\[[0-9;]*[mGKH]//g' | \
630632
sed 's/�//g' | \
631-
tr -d '\033' | \
632-
grep -v '^✓.*check passed$' | \
633-
grep -v '^✓.*completed successfully$' | \
634-
grep -v '^✓.*passed on.*file' | \
635-
grep -v '^✓ All checks passed!'
633+
tr -d '\033'
636634
637635
# Extract executed checks from output (if format allows)
638-
EXECUTED_CHECKS=$(echo "$CHECKS_OUTPUT" | grep -E "Running:|Executing:|✓" | sed 's/.*Running: //;s/.*Executing: //;s/.*✓ //' | tr '\n' ',' | sed 's/,$//' || echo "fumpt,lint,mod-tidy,whitespace,eof")
636+
EXECUTED_CHECKS=$(echo "$CHECKS_OUTPUT" | grep -E "Running:|Executing:|✓" | sed 's/.*Running: //;s/.*Executing: //;s/.*✓ //' | tr '\n' ',' | sed 's/,$//' || echo "fumpt,lint,mod-tidy,whitespace,eof,gitleaks")
639637
echo "executed=$EXECUTED_CHECKS" >> $GITHUB_OUTPUT
640638
641639
if [ "${CHECKS_EXIT:-0}" -ne 0 ]; then
@@ -722,7 +720,7 @@ jobs:
722720
fi
723721
724722
echo "### 🔍 Checks Executed" >> $GITHUB_STEP_SUMMARY
725-
CHECKS="${{ steps.run-checks.outputs.executed || 'fumpt,lint,mod-tidy,whitespace,eof' }}"
723+
CHECKS="${{ steps.run-checks.outputs.executed || 'fumpt,lint,mod-tidy,whitespace,eof,gitleaks' }}"
726724
echo "$CHECKS" | tr ',' '\n' | while read check; do
727725
if [ -n "$check" ]; then
728726
echo "- ✅ $check" >> $GITHUB_STEP_SUMMARY

.github/workflows/fortress-security-scans.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ jobs:
391391
392392
- name: 🔍 Run gitleaks scan
393393
if: steps.repo-check.outputs.is_same_repo == 'true'
394-
uses: gitleaks/gitleaks-action@ff98106e4c7b2bc287b24eaf42907196329070c7 # v8.27.2
394+
uses: gitleaks/gitleaks-action@ff98106e4c7b2bc287b24eaf42907196329070c7 # v2.3.9
395395
env:
396396
GITHUB_TOKEN: ${{ secrets.github-token }}
397397
GITLEAKS_LICENSE: ${{ secrets.gitleaks-license }}

0 commit comments

Comments
 (0)