From b2ef63f5b844db4ed8a609f91bcff484565d179a Mon Sep 17 00:00:00 2001
From: "Mr. Z" <mrz1836@users.noreply.github.com>
Date: Tue, 21 Oct 2025 18:37:22 -0400
Subject: [PATCH] sync: update 5 files from source repository

---
 .github/workflows/codeql-analysis.yml       | 4 ++--
 .github/workflows/fortress-code-quality.yml | 7 +++++--
 .github/workflows/fortress.yml              | 3 ++-
 .github/workflows/scorecard.yml             | 2 +-
 .github/workflows/sync-labels.yml           | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index d1004ae..41eaab3 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -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
 
diff --git a/.github/workflows/fortress-code-quality.yml b/.github/workflows/fortress-code-quality.yml
index 0762bcb..3669bff 100644
--- a/.github/workflows/fortress-code-quality.yml
+++ b/.github/workflows/fortress-code-quality.yml
@@ -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
 
diff --git a/.github/workflows/fortress.yml b/.github/workflows/fortress.yml
index 1c0c2d1..bbcfc2c 100644
--- a/.github/workflows/fortress.yml
+++ b/.github/workflows/fortress.yml
@@ -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:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 8983963..0fb56bc 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -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 }}
diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
index 61a5f49..a487ad0 100644
--- a/.github/workflows/sync-labels.yml
+++ b/.github/workflows/sync-labels.yml
@@ -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