Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ name: "CodeQL"

on:
push:
branches: [master]
branches: ["master", "main"] # Trigger on pushes to both master and main branches
pull_request:
# The branches below must be a subset of the branches above
branches: [master]
branches: ["master", "main"]
schedule:
- cron: "0 8 * * 1" # Every Monday at 08:00 UTC

Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/fortress-code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,11 @@ jobs:

# Get all packages and vet them one at a time
# Capture go list output and check for errors
if ! PACKAGES=$(go list ./... 2>&1 | grep -v /vendor/); then
echo "❌ go list command failed"
# Discard stderr to avoid capturing download progress messages
if ! PACKAGES=$(go list ./... 2>/dev/null | grep -v /vendor/); then
# If command failed, re-run with stderr visible to show the error
echo "❌ go list command failed:"
go list ./... 2>&1 | head -20
exit 1
fi

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/fortress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ name: GoFortress
on:
push:
branches:
- master # Main branch for production
- master # (Default) Main branch for production
- main # (Secondary) Main branch for production
tags:
- "v*" # Tags starting with 'v' (e.g., v1.0.0) trigger the workflow
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
schedule:
- cron: "0 8 * * 1" # Every Monday at 08:00 UTC
push:
branches: ["master"]
branches: ["master","main"]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ name: Sync Labels
# --------------------------------------------------------------------
on:
push:
branches: [master]
branches: [master, main] # Trigger on pushes to both master and main branches
paths:
- .github/labels.yml # Runs *only* when this file changes
workflow_dispatch: # Allow manual triggering
Expand Down