Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,32 @@
version: 2

multi-ecosystem-groups:
security:
updates:
- package-ecosystem: 'bundler'
directory: '/'
schedule:
interval: 'daily'
open-pull-requests-limit: 0 # disables version-update PRs; security PRs unaffected
pull-request-branch-name:
separator: '-'
open-pull-requests-limit: 0
groups:
security:
applies-to: security-updates
patterns: ['*']

updates:
- package-ecosystem: 'bundler'
- package-ecosystem: 'npm'
directory: '/'
patterns: ['*']
multi-ecosystem-group: 'security'
schedule:
interval: 'daily'
open-pull-requests-limit: 0
groups:
security:
applies-to: security-updates
patterns: ['*']

- package-ecosystem: 'github-actions'
directory: '/'
patterns: ['*']
multi-ecosystem-group: 'security'
schedule:
interval: 'daily'
open-pull-requests-limit: 0
groups:

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.

maybe

Suggested change
groups:
groups:
all:
patterns:
- '*'

so that all github actioons update get into one

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Good call out — but I think the current shape already does what you want, with one caveat. The block has open-pull-requests-limit: 0, which suppresses version updates entirely. The group security with applies-to: security-updates is what actually batches the security updates into one PR.

If we drop applies-to: security-updates, the default scope becomes version-updates — which limit: 0 already disables — so the group config silently no-ops, and security updates would land ungrouped (one PR per CVE). Functionally a small regression.

If we want to re-enable batched version updates for github-actions specifically (e.g. raise the limit, add an all group), happy to do that — but it deviates from the security-only convention we've standardized across ivx repos (matches the bundler + npm blocks above), so I'd want to align org-wide first.

Leaving the current shape for now. Resolving as-is — let me know if you want the broader change.

security:
applies-to: security-updates
patterns: ['*']
6 changes: 5 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,15 @@ jobs:
with:
ruby-version: ${{ matrix.ruby-version }}
bundler-cache: true
- uses: pnpm/action-setup@v6
with:
run_install: false
- uses: actions/setup-node@v6
with:
node-version: '24'
cache: pnpm
- name: Run prettier
run: npm ci && npm run lint
run: pnpm install --frozen-lockfile && pnpm run lint
- name: Run Rubocop
run: bundle exec rubocop
- name: Run tests
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pnpm-lock.yaml
6 changes: 4 additions & 2 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,22 @@ Ruby gem for building RabbitMQ consumers using Bunny.
- **connection_pool** ~> 3.0 — thread-safe channel pools for publishers
- **json** >= 2.9.0 — JSON serialization in middleware
- Dev tools: RSpec, RuboCop (rubocop-rspec, rubocop-rake), SimpleCov, YARD, Prettier (via Node)
- **Node tooling**: pnpm v11+ (pinned in `package.json#packageManager`). The JS toolchain is dev-only (Prettier on Ruby files); nothing JS ships at runtime.

## Common Commands

```bash
# Install deps
bundle install
npm install
pnpm install --frozen-lockfile

# Tests
bundle exec rspec

# Lint / format
bundle exec rubocop
npm run lint # Prettier on Ruby files
pnpm run lint # Prettier on Ruby files
pnpm run format # Prettier --write

# Autofix rubocop
bundle exec rubocop -A
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ RuboCop::RakeTask.new(:rubocop) do |task|
end

desc 'Run Prettier'
task(:prettier) { sh 'npm run lint' }
task(:prettier) { sh 'pnpm run lint' }

task default: %i[spec rubocop prettier]
71 changes: 0 additions & 71 deletions package-lock.json

This file was deleted.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"name": "ears",
"private": true,
"packageManager": "pnpm@11.5.1",
"scripts": {
"prettify": "prettier \"**/*.{ru,rb,yml,yaml,md,gemspec,json}\" --ignore-path=\".gitignore\"",
"lint": "npm run prettify -- --check",
"format": "npm run prettify -- --write"
"prettify": "prettier \"**/*.{ru,rb,yml,yaml,md,gemspec,json}\"",
"lint": "pnpm run prettify --check",
"format": "pnpm run prettify --write"
},
"devDependencies": {
"@invisionag/prettier-config": "^2.1.3",
Expand Down
48 changes: 48 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.