Skip to content

Commit e682ad4

Browse files
authored
sync: update 6 files from source repository (#53)
1 parent ddea6a7 commit e682ad4

File tree

6 files changed

+32
-16
lines changed

6 files changed

+32
-16
lines changed

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ __pycache__/
3838
*.py[cod]
3939
*$py.class
4040
.pytest_cache/
41-
..mypy_cache/
41+
.mypy_cache/
4242

4343
# Test binary, build with `go test -c`
4444
*.test

.github/.env.base

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ MAGE_X_AUTO_DISCOVER_BUILD_TAGS_EXCLUDE=race,custom # Comma-separated
238238
MAGE_X_FORMAT_EXCLUDE_PATHS=vendor,node_modules,.git,.idea # Format exclusion paths (comma-separated directories to exclude from formatting)
239239
MAGE_X_GITLEAKS_VERSION=8.28.0 # https://github.com/gitleaks/gitleaks/releases
240240
MAGE_X_GOFUMPT_VERSION=v0.9.1 # https://github.com/mvdan/gofumpt/releases
241-
MAGE_X_GOLANGCI_LINT_VERSION=v2.5.0 # https://github.com/golangci/golangci-lint/releases
241+
MAGE_X_GOLANGCI_LINT_VERSION=v2.6.0 # https://github.com/golangci/golangci-lint/releases
242242
MAGE_X_GORELEASER_VERSION=v2.12.7 # https://github.com/goreleaser/goreleaser/releases
243243
MAGE_X_GOVULNCHECK_VERSION=v1.1.4 # https://pkg.go.dev/golang.org/x/vuln
244244
MAGE_X_GO_SECONDARY_VERSION=1.24.x # Secondary Go version for MAGE-X (also our secondary)
@@ -256,6 +256,9 @@ MAGE_X_YAMLFMT_VERSION=v0.17.2 # https://github.c
256256

257257
# Optional Overrides (use .env.custom to override these defaults)
258258
# MAGE_X_BINARY_NAME=magex
259+
# MAGE_X_BUILD_BATCH_DELAY_MS=200
260+
# MAGE_X_BUILD_BATCH_SIZE=2
261+
# MAGE_X_BUILD_STRATEGY=incremental
259262
# MAGE_X_BUILD_TAGS=mage
260263
# MAGE_X_DOWNLOAD_BACKOFF=2.0
261264
# MAGE_X_DOWNLOAD_INITIAL_DELAY=300
@@ -315,7 +318,7 @@ GO_PRE_COMMIT_MAX_FILES_OPEN=100
315318
GO_PRE_COMMIT_ALL_FILES=true
316319

317320
# Tool Versions
318-
GO_PRE_COMMIT_GOLANGCI_LINT_VERSION=v2.5.0 # https://github.com/golangci/golangci-lint
321+
GO_PRE_COMMIT_GOLANGCI_LINT_VERSION=v2.6.0 # https://github.com/golangci/golangci-lint
319322
GO_PRE_COMMIT_FUMPT_VERSION=v0.9.1 # https://github.com/mvdan/gofumpt
320323
GO_PRE_COMMIT_GOIMPORTS_VERSION=latest # https://github.com/golang/tools
321324

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ go-pre-commit install
392392
go install github.com/mrz1836/go-pre-commit/cmd/go-pre-commit@latest
393393
394394
# Update tool versions in .env.base
395-
GO_PRE_COMMIT_GOLANGCI_LINT_VERSION=v2.5.0
395+
GO_PRE_COMMIT_GOLANGCI_LINT_VERSION=v2.6.0
396396
GO_PRE_COMMIT_FUMPT_VERSION=v0.9.0
397397
```
398398

.github/workflows/fortress-code-quality.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,14 @@ jobs:
263263
runner-os: ${{ inputs.primary-runner }}
264264
use-local: ${{ env.MAGE_X_USE_LOCAL }}
265265

266+
# --------------------------------------------------------------------
267+
# Capture golangci-lint version for outputs and reporting
268+
# --------------------------------------------------------------------
269+
- name: 🔍 Capture golangci-lint version
270+
id: golangci-lint-version
271+
run: |
272+
echo "version=${{ env.MAGE_X_GOLANGCI_LINT_VERSION }}" >> $GITHUB_OUTPUT
273+
266274
# --------------------------------------------------------------------
267275
# Restore Cache golangci-lint
268276
# --------------------------------------------------------------------
@@ -271,7 +279,7 @@ jobs:
271279
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
272280
with:
273281
path: ${{ env.GOLANGCI_LINT_CACHE }}
274-
key: ${{ inputs.primary-runner }}-golangci-lint-analysis-${{ hashFiles('.golangci.json', env.GO_SUM_FILE) }}
282+
key: ${{ inputs.primary-runner }}-golangci-lint-analysis-${{ hashFiles('.golangci.json', env.GO_SUM_FILE) }}-${{ steps.golangci-lint-version.outputs.version }}
275283

276284
- name: 🔍 Debug cache usage
277285
run: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ jobs:
245245
with:
246246
path: |
247247
~/.cache/govulncheck-bin
248-
key: ${{ inputs.primary-runner }}-govulncheck-${{ env.GOVULNCHECK_VERSION }}
248+
key: ${{ inputs.primary-runner }}-govulncheck-${{ env.GOVULNCHECK_VERSION }}-go${{ env.GOVULNCHECK_GO_VERSION }}
249249

250250
- name: 🛠️ Make cached govulncheck usable
251251
run: |

.github/workflows/fortress.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,9 @@ jobs:
149149
needs: [load-env, setup, test-magex, warm-cache]
150150
if: |
151151
!cancelled() &&
152-
needs.warm-cache.result != 'failure' &&
153-
needs.warm-cache.result != 'cancelled' &&
152+
needs.setup.result == 'success' &&
153+
needs.test-magex.result == 'success' &&
154+
(needs.warm-cache.result == 'success' || needs.warm-cache.result == 'skipped') &&
154155
needs.setup.outputs.security-scans-enabled == 'true'
155156
permissions:
156157
contents: read # Read repository content for security scanning
@@ -176,8 +177,9 @@ jobs:
176177
needs: [load-env, setup, test-magex, warm-cache]
177178
if: |
178179
!cancelled() &&
179-
needs.warm-cache.result != 'failure' &&
180-
needs.warm-cache.result != 'cancelled'
180+
needs.setup.result == 'success' &&
181+
needs.test-magex.result == 'success' &&
182+
(needs.warm-cache.result == 'success' || needs.warm-cache.result == 'skipped')
181183
permissions:
182184
contents: read # Read repository content for code quality checks
183185
uses: ./.github/workflows/fortress-code-quality.yml
@@ -199,8 +201,9 @@ jobs:
199201
needs: [load-env, setup, test-magex, warm-cache]
200202
if: |
201203
!cancelled() &&
202-
needs.warm-cache.result != 'failure' &&
203-
needs.warm-cache.result != 'cancelled' &&
204+
needs.setup.result == 'success' &&
205+
needs.test-magex.result == 'success' &&
206+
(needs.warm-cache.result == 'success' || needs.warm-cache.result == 'skipped') &&
204207
needs.setup.outputs.pre-commit-enabled == 'true'
205208
permissions:
206209
contents: read # Read repository content for pre-commit checks
@@ -219,8 +222,9 @@ jobs:
219222
needs: [load-env, setup, test-magex, warm-cache]
220223
if: |
221224
!cancelled() &&
222-
needs.warm-cache.result != 'failure' &&
223-
needs.warm-cache.result != 'cancelled'
225+
needs.setup.result == 'success' &&
226+
needs.test-magex.result == 'success' &&
227+
(needs.warm-cache.result == 'success' || needs.warm-cache.result == 'skipped')
224228
permissions:
225229
contents: write # Write repository content and push to gh-pages branch for test execution
226230
pull-requests: write # Required: Coverage workflow needs to create PR comments
@@ -259,8 +263,9 @@ jobs:
259263
needs: [load-env, setup, test-magex, warm-cache]
260264
if: |
261265
!cancelled() &&
262-
needs.warm-cache.result != 'failure' &&
263-
needs.warm-cache.result != 'cancelled' &&
266+
needs.setup.result == 'success' &&
267+
needs.test-magex.result == 'success' &&
268+
(needs.warm-cache.result == 'success' || needs.warm-cache.result == 'skipped') &&
264269
needs.setup.outputs.benchmarks-enabled == 'true'
265270
permissions:
266271
contents: read # Read repository content for benchmarking

0 commit comments

Comments
 (0)