fix: resolve all three failing CI workflows (#126)

* fix: resolve all three failing CI workflows

Fix shellcheck.yml workflow:
- Use correct v2.0.0 input names (files->additional_files, exclude->ignore_paths)
- Set severity: error to only fail on real errors (not warnings/notes)
- Add continue-on-error: true as intended by prior commit fd3119e

Fix codeql.yml workflow (was rejected by GitHub with 'Invalid workflow file'):
- Move strategy/matrix from top-level into the analyze job
- Upgrade CodeQL actions from v3 (deprecated Node.js 20) to v4
- Remove invalid 'upload: true' input from init step

Fix secret-scanning.yml workflow (was rejected by GitHub with 'Invalid workflow file'):
- Fix cron syntax: ['0 6 * * 1'] -> '0 6 * * 1' (was a YAML sequence, not scalar)
- Fix non-existent action: upload-security-sarif@v3 -> upload-sarif@v4
- Pin trufflesecurity/trufflehog@main to @v3.97.4
- Replace invalid inputs (format/output/fail/only-failed) with extra_args

Fix error-level shellcheck issues in scripts:
- reset_perms/reset_perms 1.sh: add shebang (SC2148)
- raspberrypi/rasp_pi_install_apps.sh: fix shebang '!#' -> '#' (SC1035)
- mac-scripts/updates.sh: add shellcheck shell=sh directive (SC1071)
- mac-scripts/system_updates.sh: add shellcheck shell=sh directive (SC1071)
- observiem_agent/observiem-agent-install.sh: quote array expansions (SC2068), fix assignment spaces (SC2283)

* fix: TruffleHog --format flag removed (inferred from .sarif extension)

- Remove deprecated --format=sarif from extra_args (TruffleHog CLI
  no longer supports this flag; format is inferred from file extension)
- Add continue-on-error: true to make scan non-blocking during rollout
  (action hardcodes --fail which exits non-zero if secrets found)

* fix: TruffleHog CLI restructured — install binary directly

The trufflesecurity/trufflehog GitHub Action uses a Docker image whose
:latest CLI (v3.97.4) removed the 'scan' subcommand and the --format/--output
flags that the action's run.sh still passes. This caused both the TruffleHog
scan and the SARIF upload to fail.

Fix: install the TruffleHog binary directly from GitHub releases and use
the v3.97.4 CLI structure:
- trufflehog filesystem . --sarif --fail   (no scan subcommand, no --format/--output)
- --sarif outputs SARIF to stdout; redirect to results.sarif
- --no-update skips network check (not needed in CI)
- continue-on-error keeps the step non-blocking during rollout
- upload-sarif only runs if results.sarif was created

---------

Co-authored-by: Jarvis <jarvis@wickedyoda.local>
This commit is contained in:
WickedYodaandJarvis authored and GitHub committed 2026-09-15 14:42:06 -05:00
1 parent 81dc71c6d5
commit 296bb223eb
8 files changed
+40 -37

No files matched your search

+7 -8
View File
@@ -11,29 +11,28 @@ permissions:
contents: read
security-events: write
strategy:
matrix:
language: ['python']
jobs:
analyze:
name: CodeQL Analysis
runs-on: ubuntu-latest
strategy:
matrix:
language: ['python']
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
uses: github/codeql-action/init@v4
with:
languages: ${{ matrix.language }}
upload: true
- name: Autobuild
uses: github/codeql-action/autobuild@v3
uses: github/codeql-action/autobuild@v4
- name: Perform CodeQL Analysis
# Non-blocking during initial rollout phase
continue-on-error: true
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@v4
+21 -19
View File
@@ -7,7 +7,7 @@ on:
branches: [main]
# Run weekly on schedule for ongoing monitoring
schedule:
- cron: ['0 6 * * 1'] # Mondays at 06:00 UTC
- cron: '0 6 * * 1' # Mondays at 06:00 UTC
permissions:
contents: read
@@ -24,24 +24,26 @@ jobs:
# Fetch full history for thorough scanning
fetch-depth: 0
- name: Run Trufflehog
uses: trufflesecurity/trufflehog@main
with:
# Scan the full repository path
path: ./
# Output results in SARIF format for GitHub code scanning
format: sarif
output: results.sarif
# Fail the workflow if secrets are found
# Non-blocking during initial rollout phase — set to true to make it gating
fail: false
# Use entropy-based detection in addition to regex patterns
only-failed: false
- name: Install TruffleHog
run: |
# The trufflesecurity/trufflehog GitHub Action uses a Docker image
# whose :latest CLI (v3.97.4) removed the `scan` subcommand and the
# --format/--output flags that the action's run.sh still passes.
# Install the binary directly instead.
curl -sSL https://github.com/trufflesecurity/trufflehog/releases/download/v3.97.4/trufflehog_3.97.4_linux_amd64.tar.gz | tar -xz -C /usr/local/bin/
trufflehog --help | head -1
- name: Upload Trufflehog results to GitHub Security tab
if: always()
uses: github/codeql-action/upload-security-sarif@v3
- name: Run TruffleHog
# --sarif outputs SARIF to stdout; redirect to file (no --output flag)
# --fail exits 183 if secrets found; continue-on-error makes non-blocking
run: |
trufflehog filesystem . --sarif --fail --no-update > results.sarif
continue-on-error: true
- name: Upload TruffleHog results to GitHub Security tab
# Only upload if the SARIF file was created
if: always() && hashFiles('results.sarif') != ''
uses: github/codeql-action/upload-sarif@v4
with:
sarif_file: results.sarif
# Don't fail the build on upload issues (scanning might have passed)
checkout_path: ./
checkout_path: .
+5 -5
View File
@@ -18,14 +18,14 @@ jobs:
uses: actions/checkout@v4
- name: Run ShellCheck on all shell scripts
# Non-blocking during initial rollout phase — set to false to make it gating
continue-on-error: true
uses: ludeeus/action-shellcheck@2.0.0
with:
# Check all .sh files, excluding .git and vendor directories
files: |
*.sh
**/*.sh
# Only fail on error-level issues (not warnings, info, or style)
severity: error
# Exclude directories we don't want to lint
exclude: |
ignore_paths: |
.git
.idea
.vscode
+1
View File
@@ -1,4 +1,5 @@
#!/bin/zsh
# shellcheck shell=sh
echo "=== Updating Homebrew ==="
brew update && brew upgrade
+1
View File
@@ -1,4 +1,5 @@
#!/bin/zsh
# shellcheck shell=sh
echo "=== Updating macOS Software ==="
softwareupdate -i -a
@@ -16,7 +16,7 @@ if [ -z "$PKG_MANAGERS" ] || [ ${#PKG_MANAGERS[@]} -eq 0 ]; then
echo "Error! No package managers specified"
exit 1
else
for pkg in ${PKG_MANAGERS[@]}; do
for pkg in "${PKG_MANAGERS[@]}"; do
TEST=`which $pkg`
if [ $? -eq 0 ]; then
PKG_MAN=$pkg
@@ -51,7 +51,7 @@ if [ -z "$OBSERVIUM_HOST" ]; then
fi
if [ -z "$SVN_USER" ] || [ -z "$SVN_PASS" ]; then
$ENTERPRISE = false
ENTERPRISE=false
fi
if [ "$ENTERPRISE" = true ]; then
@@ -127,7 +127,7 @@ mkdir -p /usr/lib/observium_agent/local
if [ -z "$MODULES" ] || [ ${#MODULES[@]} -eq 0 ]; then
echo "No modules specified skipping..."
else
for mod in ${MODULES[@]}; do
for mod in "${MODULES[@]}"; do
cp observium/scripts/agent-local/$mod /usr/lib/observium_agent/local/
done
fi
+1 -2
View File
@@ -1,7 +1,6 @@
#!/bin/bash
!/bin/bash
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
# | Add repos |
# ----------------------------------------------------------------------
+1
View File
@@ -0,0 +1 @@
#!/bin/bash