Skip to content

Commit 13dbc0e

Browse files
authored
sync: update 4 files from source repository (#191)
1 parent 604fc3b commit 13dbc0e

4 files changed

Lines changed: 20 additions & 5 deletions

File tree

.github/.env.base

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ MAGE_X_AUTO_DISCOVER_BUILD_TAGS_EXCLUDE=race,custom # Comma-separated
231231
MAGE_X_FORMAT_EXCLUDE_PATHS=vendor,node_modules,.git,.idea # Format exclusion paths (comma-separated directories to exclude from formatting)
232232
MAGE_X_GITLEAKS_VERSION=8.28.0 # https://github.com/gitleaks/gitleaks/releases
233233
MAGE_X_GOFUMPT_VERSION=v0.9.1 # https://github.com/mvdan/gofumpt/releases
234-
MAGE_X_GOLANGCI_LINT_VERSION=v2.4.0 # https://github.com/golangci/golangci-lint/releases
235-
MAGE_X_GORELEASER_VERSION=v2.12.0 # https://github.com/goreleaser/goreleaser/releases
234+
MAGE_X_GOLANGCI_LINT_VERSION=v2.5.0 # https://github.com/golangci/golangci-lint/releases
235+
MAGE_X_GORELEASER_VERSION=v2.12.2 # https://github.com/goreleaser/goreleaser/releases
236236
MAGE_X_GOVULNCHECK_VERSION=v1.1.4 # https://pkg.go.dev/golang.org/x/vuln
237237
MAGE_X_GO_SECONDARY_VERSION=1.24.x # Secondary Go version for MAGE-X (also our secondary)
238238
MAGE_X_GO_VERSION=1.24.x # Primary Go version for MAGE-X (also our primary)
@@ -274,6 +274,11 @@ GITLEAKS_CONFIG_FILE=
274274
# Nancy CVE Exclusions (known acceptable vulnerabilities)
275275
NANCY_EXCLUDES=CVE-2024-38513,CVE-2023-45142
276276

277+
# OSS Index Authentication for Nancy (optional)
278+
# Username (email) for OSS Index authentication - reduces rate limits and provides better vulnerability data
279+
# Get your API token from: https://ossindex.sonatype.org/user-token
280+
# Github Secret(s): OSSI_USERNAME and OSSI_TOKEN
281+
277282
# Security Tools
278283
GITLEAKS_VERSION=8.28.0 # https://github.com/gitleaks/gitleaks/releases
279284
GOVULNCHECK_VERSION=v1.1.4 # https://pkg.go.dev/golang.org/x/vuln
@@ -303,7 +308,7 @@ GO_PRE_COMMIT_MAX_FILES_OPEN=100
303308
GO_PRE_COMMIT_ALL_FILES=true
304309

305310
# Tool Versions
306-
GO_PRE_COMMIT_GOLANGCI_LINT_VERSION=v2.4.0 # https://github.com/golangci/golangci-lint
311+
GO_PRE_COMMIT_GOLANGCI_LINT_VERSION=v2.5.0 # https://github.com/golangci/golangci-lint
307312
GO_PRE_COMMIT_FUMPT_VERSION=v0.9.1 # https://github.com/mvdan/gofumpt
308313
GO_PRE_COMMIT_GOIMPORTS_VERSION=latest # https://github.com/golang/tools
309314

.github/tech-conventions/pre-commit.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@ Pin specific tool versions for consistency across environments:
9898

9999
```bash
100100
# External tool versions
101-
GO_PRE_COMMIT_GOLANGCI_LINT_VERSION=v2.4.0
102-
GO_PRE_COMMIT_FUMPT_VERSION=v0.8.0
101+
GO_PRE_COMMIT_FUMPT_VERSION=latest
103102
GO_PRE_COMMIT_GOIMPORTS_VERSION=latest
104103
```
105104

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ on:
5151
gitleaks-license:
5252
description: "Gitleaks license key"
5353
required: false
54+
ossi-username:
55+
description: "OSS Index username or email for Nancy authentication"
56+
required: false
57+
ossi-token:
58+
description: "OSS Index API token for Nancy authentication"
59+
required: false
5460

5561
# Security: Restrictive default permissions with job-level overrides for least privilege access
5662
permissions:
@@ -124,6 +130,9 @@ jobs:
124130
- name: 🔍 Ask Nancy
125131
uses: sonatype-nexus-community/nancy-github-action@726e338312e68ecdd4b4195765f174d3b3ce1533 # v1.0.3
126132
continue-on-error: false
133+
env:
134+
OSSI_USERNAME: ${{ secrets.ossi-username }}
135+
OSSI_TOKEN: ${{ secrets.ossi-token }}
127136
with:
128137
githubToken: ${{ secrets.github-token }} # ← prevents rate-limit 403
129138
nancyVersion: ${{ env.NANCY_VERSION }}

.github/workflows/fortress.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@ jobs:
207207
secrets:
208208
github-token: ${{ secrets.GH_PAT_TOKEN != '' && secrets.GH_PAT_TOKEN || secrets.GITHUB_TOKEN }}
209209
gitleaks-license: ${{ secrets.GITLEAKS_LICENSE }}
210+
ossi-token: ${{ secrets.OSSI_TOKEN }}
211+
ossi-username: ${{ secrets.OSSI_USERNAME }}
210212
# ----------------------------------------------------------------------------------
211213
# Code Quality Checks
212214
# ----------------------------------------------------------------------------------

0 commit comments

Comments
 (0)