Skip to content

Maintenance - #440

Merged
ikostan merged 2 commits into
mainfrom
maintenance
Mar 2, 2026
Merged

ikostan merged 2 commits into
mainfrom
maintenance

Conversation

@ikostan

@ikostan ikostan commented Mar 2, 2026

Copy link
Copy Markdown
Owner

name: Default Pull Request Template
about: Suggesting changes to SkyLockAssault
title: ''
labels: ''
assignees: ''

Description

What does this PR do? (e.g., "Fixes player jump physics in level 2" or "Adds
new enemy AI script")

Related Issue

Closes #ISSUE_NUMBER (if applicable)

Changes

  • List key changes here (e.g., "Updated Jump.gd to use Godot 4.4's new Tween
    system")
  • Any breaking changes? (e.g., "Deprecated old signal; migrate to new one")

Testing

  • Ran the game in Godot v4.5 editor—describe what you tested (e.g., "Jump
    works on Win10 with 60 FPS")
  • Any new unit tests added? (Link to test scene if yes)
  • Screenshots/GIFs if UI-related: (Attach below)

Checklist

  • Code follows Godot style guide (e.g., snake_case for variables)
  • No console errors in editor/output
  • Ready for review!

Additional Notes

Anything else? (e.g., "Tested on Win10 64-bit; needs Linux validation")

Summary by Sourcery

Update Trivy GitHub Actions workflow to use the official Trivy action and improve scan configuration.

CI:

  • Upgrade checkout action to v6 and configure it to use the triggering branch with shallow clone and no persisted credentials.
  • Replace manual Trivy installation and CLI invocation with the maintained aquasecurity/trivy-action, configuring SARIF output, scanners, severities, and failure conditions.
  • Remove the unused auxiliary Trivy workflow file _trivy.yml.

Summary by CodeRabbit

  • Chores
    • Optimized vulnerability scanning infrastructure by consolidating Trivy scanner setup steps into a unified, more efficient action.
    • Enhanced security scanning configuration with improved detection options for comprehensive threat identification.
    • Updated security scanning dependencies to the latest versions.

@sourcery-ai

sourcery-ai Bot commented Mar 2, 2026

Copy link
Copy Markdown
Contributor
Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Updates the Trivy security scan GitHub Actions workflow to use newer, action-based scanning with explicit configuration, removes the custom Trivy installer workflow, and deletes a redundant Trivy workflow file.

File-Level Changes

Change Details Files
Modernize Trivy GitHub Actions workflow configuration and execution.
  • Bump actions/checkout from v4 to v6 and configure it to check out the triggering branch with full history and without persisting credentials.
  • Replace manual Trivy installation and CLI invocation with the official aquasecurity/trivy-action, configuring it to run an FS scan with multiple scanners and SARIF output.
  • Configure Trivy to skip version checks, focus on HIGH and CRITICAL severities, fail the job on such findings, and ignore unfixed vulnerabilities.
  • Keep SARIF upload step using codeql-action while ensuring it always runs even if the scan fails.
.github/workflows/trivy.yml
Remove unused or redundant Trivy workflow.
  • Delete the secondary Trivy workflow file to avoid duplication or confusion with the main Trivy workflow.
.github/workflows/_trivy.yml

Possibly linked issues

  • #Integrate Trivy for Security Scanning: PR modernizes and configures the Trivy GitHub Actions workflow, fulfilling the issue’s requested CI security scanning integration.

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@ikostan
ikostan merged commit d857ddf into main Mar 2, 2026
10 of 12 checks passed
@github-project-automation github-project-automation Bot moved this from In Progress to Done in Sky Lock Assault Project Mar 2, 2026
@coderabbitai

coderabbitai Bot commented Mar 2, 2026

Copy link
Copy Markdown
Contributor

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between c95f68e and fe656a6.

📒 Files selected for processing (2)
  • .github/workflows/_trivy.yml
  • .github/workflows/trivy.yml

📝 Walkthrough

Walkthrough

The PR removes the reusable Trivy vulnerability scanner workflow and consolidates Trivy scanning in the main workflow. The main workflow upgrades the checkout action from v4 to v6, replaces manual Trivy setup and FS scan steps with a single aquasecurity/trivy-action invocation, and retains SARIF result uploading.

Changes

Cohort / File(s) Summary
Trivy Workflow Consolidation
.github/workflows/_trivy.yml, .github/workflows/trivy.yml
Removed reusable Trivy workflow; updated main Trivy workflow with actions/checkout@v6, consolidated manual Trivy steps into aquasecurity/trivy-action@0.69.2, configured SARIF output with severity filtering (CRITICAL,HIGH), and preserved SARIF upload step.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

  • Maintenance #434: Updates actions/checkout version in the same Trivy workflow file with similar modernization pattern.

Suggested labels

tools, github actions, github_actions

Poem

🐰 Trivy hops with vigor, scanning paths so clear,
Workflows now consolidated, no more reuse to fear!
Actions upgraded, v6 now leads the way,
SARIF reports flow swift, vulnerabilities held at bay!
Security strengthened, with each hop so true,
CodeRabbit celebrates this workflow breakthrough! 🔒✨

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch maintenance

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@deepsource-io

deepsource-io Bot commented Mar 2, 2026

Copy link
Copy Markdown

DeepSource Code Review

We reviewed changes in c95f68e...fe656a6 on this pull request. Below is the summary for the review, and you can see the individual issues we found as inline review comments.

See full review on DeepSource ↗

PR Report Card

Overall Grade   Security  

Reliability  

Complexity  

Hygiene  

Code Review Summary

Analyzer Status Updated (UTC) Details
Python Mar 2, 2026 4:49a.m. Review ↗
JavaScript Mar 2, 2026 4:49a.m. Review ↗

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - I've found 2 issues, and left some high level feedback:

  • Consider pinning aquasecurity/trivy-action to a specific commit SHA instead of @0.69.2 (and avoid version: 'latest') to keep the workflow reproducible and reduce the risk of supply-chain issues from upstream changes.
  • Since this job only runs an fs scan on the checked-out repository, you likely don’t need fetch-depth: 0; using a shallow clone (e.g., fetch-depth: 1) will make the workflow faster and reduce network usage.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- Consider pinning `aquasecurity/trivy-action` to a specific commit SHA instead of `@0.69.2` (and avoid `version: 'latest'`) to keep the workflow reproducible and reduce the risk of supply-chain issues from upstream changes.
- Since this job only runs an `fs` scan on the checked-out repository, you likely don’t need `fetch-depth: 0`; using a shallow clone (e.g., `fetch-depth: 1`) will make the workflow faster and reduce network usage.

## Individual Comments

### Comment 1
<location path=".github/workflows/trivy.yml" line_range="16" />
<code_context>
-      security-events: write  # For uploading SARIF to Security tab
-    steps:
-      - name: "Checkout repository"
-        uses: "actions/checkout@v6"
-        with:
-          # This explicitly tells the runner to use the branch that triggered the workflow
</code_context>
<issue_to_address>
**issue (bug_risk):** The `actions/checkout@v6` reference is likely invalid and will cause the job to fail.

`actions/checkout` currently only goes up to `v4`, so `@v6` will fail to resolve and the workflow will stop before reaching the Trivy step. Use `actions/checkout@v4` (or a pinned v4 commit) instead.
</issue_to_address>

### Comment 2
<location path=".github/workflows/trivy.yml" line_range="22-23" />
<code_context>
-          ref: ${{ github.ref_name }}
-          fetch-depth: 0
-          persist-credentials: false
-      - name: "Run Trivy vulnerability scanner"
-        uses: "aquasecurity/trivy-action@c1824fd6edce30d7ab345a9989de00bbd46ef284"  # Pinned to SHA for v0.34.0
-        env:  # Suppress version check notification
</code_context>
<issue_to_address>
**🚨 suggestion (security):** The Trivy action is version-tagged and also configured with `version: 'latest'`, which reduces reproducibility and supply-chain safety.

Relying on a floating tag and `version: 'latest'` makes the workflow vulnerable to tag retargeting and unexpected upgrades. Please:
- Pin `aquasecurity/trivy-action` to the commit SHA of the intended release (e.g., the SHA for v0.69.2), and
- Either drop the `version` input or set it to a specific Trivy CLI version so scans are deterministic.
This keeps behavior stable even if tags move or future Trivy releases change behavior.

Suggested implementation:

```
      - name: "Run Trivy vulnerability scanner"
        uses: "aquasecurity/trivy-action@<TRIVY_ACTION_V0_69_2_COMMIT_SHA>"  # Pinned to SHA for v0.69.2
        # uses: "aquasecurity/trivy-action@0.69.2"  # v0.69.2 tag (do not use floating tags in production)
        # uses: "aquasecurity/trivy-action@c1824fd6edce30d7ab345a9989de00bbd46ef284"  # Pinned to SHA for v0.34.0
        env:  # Suppress version check notification
          TRIVY_SKIP_VERSION_CHECK: 'true'
        with:
          version: '0.69.2'
          scan-type: 'fs'  # Scans the filesystem (your repo after checkout)

```

1. Replace `&lt;TRIVY_ACTION_V0_69_2_COMMIT_SHA&gt;` with the actual commit SHA corresponding to the Trivy action release v0.69.2 (from https://github.com/aquasecurity/trivy-action/releases or the v0.69.2 tag).
2. Optionally, if the Trivy CLI version you want differs from the action version, update `version: '0.69.2'` to the exact CLI version you intend to standardize on, and document this in a comment for future maintainers.
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

steps:
- name: "Checkout repository"
uses: "actions/checkout@v4"
uses: "actions/checkout@v6"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (bug_risk): The actions/checkout@v6 reference is likely invalid and will cause the job to fail.

actions/checkout currently only goes up to v4, so @v6 will fail to resolve and the workflow will stop before reaching the Trivy step. Use actions/checkout@v4 (or a pinned v4 commit) instead.

Comment on lines +22 to +23
- name: "Run Trivy vulnerability scanner"
uses: "aquasecurity/trivy-action@0.69.2"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚨 suggestion (security): The Trivy action is version-tagged and also configured with version: 'latest', which reduces reproducibility and supply-chain safety.

Relying on a floating tag and version: 'latest' makes the workflow vulnerable to tag retargeting and unexpected upgrades. Please:

  • Pin aquasecurity/trivy-action to the commit SHA of the intended release (e.g., the SHA for v0.69.2), and
  • Either drop the version input or set it to a specific Trivy CLI version so scans are deterministic.
    This keeps behavior stable even if tags move or future Trivy releases change behavior.

Suggested implementation:

      - name: "Run Trivy vulnerability scanner"
        uses: "aquasecurity/trivy-action@<TRIVY_ACTION_V0_69_2_COMMIT_SHA>"  # Pinned to SHA for v0.69.2
        # uses: "aquasecurity/trivy-action@0.69.2"  # v0.69.2 tag (do not use floating tags in production)
        # uses: "aquasecurity/trivy-action@c1824fd6edce30d7ab345a9989de00bbd46ef284"  # Pinned to SHA for v0.34.0
        env:  # Suppress version check notification
          TRIVY_SKIP_VERSION_CHECK: 'true'
        with:
          version: '0.69.2'
          scan-type: 'fs'  # Scans the filesystem (your repo after checkout)

  1. Replace &lt;TRIVY_ACTION_V0_69_2_COMMIT_SHA&gt; with the actual commit SHA corresponding to the Trivy action release v0.69.2 (from https://github.com/aquasecurity/trivy-action/releases or the v0.69.2 tag).
  2. Optionally, if the Trivy CLI version you want differs from the action version, update version: '0.69.2' to the exact CLI version you intend to standardize on, and document this in a comment for future maintainers.

@coderabbitai coderabbitai Bot mentioned this pull request Mar 2, 2026
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

1 participant