fix: resolve failing CI (run 33123343984)

[WomB0ComB0]

Automated CI fix from ralph triage --fix-ci using a local model. Failing run: https://github.com/resq-software/programs/actions/runs/33123343984

⚠️ Agent-generated — please review before merging.

Summary by CodeRabbit

• Chores
  • Updated merge handling for workflow lock files to use the default merge strategy.
  • Continued marking these files as generated content.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Team

Run ID: a702410d-4706-45d5-b2b0-6389141b8477

📥 Commits

Reviewing files that changed from the base of the PR and between 6022d58 and 028b088.

📒 Files selected for processing (1)

• .gitattributes

Included review availability: Your plan provides up to 1 included review per hour; 0 remain after this review.

---

📝 Walkthrough

Walkthrough

The .gitattributes rule for .github/workflows/*.lock.yml no longer sets merge=ours. These files now use the default merge strategy. The linguist-generated=true attribute remains unchanged.

Changes

Workflow lock merge behavior

Layer / File(s)	Summary
Update workflow lock merge strategy .gitattributes	The workflow lock-file pattern removes merge=ours and retains linguist-generated=true.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Merge Risk: ⚪ Minimal · up to 028b0

Workflow lock files now use Git's default merge behavior rather than always retaining the current branch version. No concrete merge-blocking risk remains.

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title identifies the pull request as a fix for the failing CI run specified in the objectives. It is concise and related to the change.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0…
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch ralph/fix-ci-33123343984

---

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

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[github-actions]

Audit Summary: Passed ✅

The changes in this PR are limited to .gitattributes and correctly address a potential issue with workflow lockfiles.

Analysis of Changes:

• File: .gitattributes
• Change: Removed merge=ours strategy for .github/workflows/*.lock.yml.

Findings:

• Correctness: Removing merge=ours is a positive change. The ours merge strategy can lead to silent data loss or out-of-sync lockfiles when both branches make changes. For generated files like *.lock.yml, surfacing merge conflicts ensures that developers are aware they need to regenerate the lockfiles from the merged source, maintaining consistency.
• Security: This change improves security by ensuring that updates to security-sensitive workflows are not silently discarded during a merge.
• Performance: No performance impact identified.

The audit has passed as the change improves the robustness and reliability of the workflow generation process.

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

• localhost

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "localhost"

See Network Configuration for more information.

Generated by ai-auditor for issue #69 · ◷

[WomB0ComB0]

Ralph verified: CI is green and the PR is mergeable — ready for your review/merge.