Skip to content

Conversation

@pboling
Copy link
Member

@pboling pboling commented Dec 12, 2025

No description provided.

@pboling pboling self-assigned this Dec 12, 2025
Copilot AI review requested due to automatic review settings December 12, 2025 20:34
@github-advanced-security
Copy link

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This pull request prepares the bash-merge project for its 1.0.0 release by adding a signing certificate, cleaning up legacy Ruby version support, and adjusting coverage thresholds. However, there are a couple of issues that need to be addressed before the release.

Key Changes

  • Adds a signing certificate valid from 2025-05-04 to 2045-04-29
  • Removes support for EOL Ruby versions (2.3-3.1 and JRuby 9.4)
  • Adjusts code coverage requirements from 100% to more realistic thresholds (96% line, 85% branch)

Reviewed changes

Copilot reviewed 10 out of 10 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
certs/pboling.pem New signing certificate added (20-year validity period)
README.md Updated copyright year to 2025 only
CHANGELOG.md Restructured to reference v1.0.0 instead of v0.1.0
Appraisals Removed appraisal configurations for Ruby 2.3-3.1
.github/workflows/unsupported.yml Removed CI workflow for EOL Ruby 2.6 & 2.7
.github/workflows/main.yml Removed simple Ruby 3.4.7 workflow
.github/workflows/legacy.yml Removed CI workflow for EOL Ruby 3.0 & 3.1
.github/workflows/jruby.yml Removed JRuby CI workflow
.github/workflows/coverage.yml Reduced coverage thresholds from 100/100 to 96/85
.github/workflows/ancient.yml Removed CI workflow for EOL Ruby 2.3, 2.4 & 2.5

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

-----BEGIN CERTIFICATE-----
MIIEgDCCAuigAwIBAgIBATANBgkqhkiG9w0BAQsFADBDMRUwEwYDVQQDDAxwZXRl
ci5ib2xpbmcxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkW
A2NvbTAeFw0yNTA1MDQxNTMzMDlaFw00NTA0MjkxNTMzMDlaMEMxFTATBgNVBAMM
Copy link

Copilot AI Dec 12, 2025

Choose a reason for hiding this comment

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

The PR title indicates the certificate expires on 2025-04-29, but the certificate content shows it's valid from 2025-05-04 to 2045-04-29 (expires in 2045, not 2025). The expiration date in the PR title should be corrected to 2045-04-29.

Copilot uses AI. Check for mistakes.

### Added

- Initial release
Copy link

Copilot AI Dec 12, 2025

Choose a reason for hiding this comment

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

The "Initial release" is listed under the Unreleased section, but the PR is preparing for a release (v1.0.0). For a proper release, this should be moved to a versioned section like "## [1.0.0] - 2025-12-12" (or the appropriate release date), and the Unreleased section should be empty or removed.

Copilot uses AI. Check for mistakes.
- Migrated from `ruby_tree_sitter` to `tree_haver` for unified cross-platform tree-sitter support
@pboling pboling changed the title 🔐 Add signing cert (exp 2025-04-29); prepare release 🔐 Add signing cert (exp 2045-04-29); prepare release Dec 18, 2025
- **SmartMerger**: Added `**options` for forward compatibility
  - Accepts additional options that may be added to base class in future
  - Passes all options through to `SmartMergerBase`
- **ConflictResolver**: Added `**options` and `match_refiner` for forward compatibility
- **MergeResult**: Added `**options` for forward compatibility
- **FileAnalysis**: Simplified to use `TreeHaver.parser_for` API
  - Removed 30+ lines of grammar loading boilerplate
  - Now relies on tree_haver for auto-discovery and fallback
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants