diff --git a/.github/workflows/dependabot_automerge.yml b/.github/workflows/dependabot_automerge.yml index 75dc4bc3..f0378fea 100644 --- a/.github/workflows/dependabot_automerge.yml +++ b/.github/workflows/dependabot_automerge.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Dependabot metadata id: metadata - uses: dependabot/fetch-metadata@v1.6.0 + uses: dependabot/fetch-metadata@v2.0.0 with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Enable auto-merge for Dependabot PRs diff --git a/Gemfile.lock b/Gemfile.lock index a44e5362..1bb67d2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,6 +67,7 @@ GEM rubocop-sorbet (0.8.0) rubocop (>= 0.90.0) ruby-progressbar (1.13.0) +<<<<<<< HEAD sorbet (0.5.11319) sorbet-static (= 0.5.11319) sorbet-runtime (0.5.11319) @@ -75,6 +76,24 @@ GEM sorbet-static-and-runtime (0.5.11319) sorbet (= 0.5.11319) sorbet-runtime (= 0.5.11319) +||||||| parent of 42b8d68 (Bump dependabot/fetch-metadata from 1.6.0 to 2.0.0) + sorbet (0.5.11287) + sorbet-static (= 0.5.11287) + sorbet-runtime (0.5.11287) + sorbet-static (0.5.11287-universal-darwin) + sorbet-static (0.5.11287-x86_64-linux) + sorbet-static-and-runtime (0.5.11287) + sorbet (= 0.5.11287) + sorbet-runtime (= 0.5.11287) +======= + sorbet (0.5.11287) + sorbet-static (= 0.5.11287) + sorbet-runtime (0.5.11287) + sorbet-static (0.5.11287-universal-darwin) + sorbet-static-and-runtime (0.5.11287) + sorbet (= 0.5.11287) + sorbet-runtime (= 0.5.11287) +>>>>>>> 42b8d68 (Bump dependabot/fetch-metadata from 1.6.0 to 2.0.0) stringio (3.1.0) tapioca (0.13.1) bundler (>= 2.2.25) @@ -93,10 +112,7 @@ GEM yard (>= 0.9) PLATFORMS - arm64-darwin-21 arm64-darwin-23 - universal-darwin-22 - x86_64-linux DEPENDENCIES bundler (>= 2.2.10)