Skip to content

Commit

Permalink
chore: Update ruby version
Browse files Browse the repository at this point in the history
```
  • Loading branch information
addersuk committed Jun 21, 2024
1 parent 87b82ff commit 7aafc6c
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 26 deletions.
6 changes: 4 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@ updates:
- package-ecosystem: bundler
directory: "/"
schedule:
interval: daily
interval: "weekly"
day: "monday"
time: "07:00"
open-pull-requests-limit: 99
labels:
- dependencies
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
interval: "weekly"
day: "monday"
time: "07:00"
open-pull-requests-limit: 99
labels:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

strategy:
matrix:
ruby-version: [3.1.2]
ruby-version: [3.1, 3.2, 3.3]

steps:
- uses: actions/checkout@v3
Expand Down
29 changes: 12 additions & 17 deletions .github/workflows/dependabot-auto-approve-merge.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: "Dependabot auto approve and merge"
on:
on:
pull_request:
types:
- opened
- synchronize
- reopened
branches:
- master

Expand All @@ -9,19 +13,10 @@ permissions:
contents: write

jobs:
dependabot:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/[email protected]
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Approve and Enable auto-merge for Dependabot PRs
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch' }}
run: |
gh pr review --approve "$PR_URL" -b "@dependabot merge"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.SB_SILVERSMITHS_BOT}}
dependabot-auto-merge-all:
uses: simplybusiness/github-action-reusable-workflows/.github/workflows/dependabot-auto-approve-and-merge-minor-patch.yaml@v1
with:
pr_url: ${{ github.event.pull_request.html_url }}
actor: ${{ github.actor }}
secrets:
github-token: ${{secrets.SB_SILVERSMITHS_BOT}}
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.2
3.3.2
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# frozen_string_literal: true

ruby '3.1.2'
source 'https://rubygems.org'

gem 'airbrake-ruby'
Expand Down
5 changes: 1 addition & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,5 @@ DEPENDENCIES
vcr
webmock

RUBY VERSION
ruby 3.1.2p20

BUNDLED WITH
2.2.26
2.5.14

0 comments on commit 7aafc6c

Please sign in to comment.