diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1bcfb23..f4096ba 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,7 +3,8 @@ updates: - package-ecosystem: bundler directory: "/" schedule: - interval: daily + interval: "weekly" + day: "monday" time: "07:00" open-pull-requests-limit: 99 labels: @@ -11,7 +12,8 @@ updates: - package-ecosystem: github-actions directory: "/" schedule: - interval: daily + interval: "weekly" + day: "monday" time: "07:00" open-pull-requests-limit: 99 labels: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f44f04..958a1af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/.github/workflows/dependabot-auto-approve-merge.yml b/.github/workflows/dependabot-auto-approve-merge.yml index 71f2580..4f4c3a9 100644 --- a/.github/workflows/dependabot-auto-approve-merge.yml +++ b/.github/workflows/dependabot-auto-approve-merge.yml @@ -1,6 +1,10 @@ name: "Dependabot auto approve and merge" -on: +on: pull_request: + types: + - opened + - synchronize + - reopened branches: - master @@ -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/fetch-metadata@v1.3.6 - 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}} diff --git a/.ruby-version b/.ruby-version index ef538c2..4772543 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.2 +3.3.2 diff --git a/Gemfile b/Gemfile index 01bdd9b..5062971 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,5 @@ # frozen_string_literal: true -ruby '3.1.2' source 'https://rubygems.org' gem 'airbrake-ruby' diff --git a/Gemfile.lock b/Gemfile.lock index 7c1532f..ffd8880 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -133,8 +133,5 @@ DEPENDENCIES vcr webmock -RUBY VERSION - ruby 3.1.2p20 - BUNDLED WITH - 2.2.26 + 2.5.14