diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3a8cdbf..a2780c1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,8 +2,8 @@ # # Anyone can edit # -# This allows the @1debitops user to approve PRs and automerge them. -# If you add someone below, you must also add @1debitops on the same line, +# This allows the @chime-dependency-bot user to approve PRs and automerge them. +# If you add someone below, you must also add @chime-dependency-bot on the same line, # otherwise automerge will break. # If you wish to not restrict reviewers for these files, but want to get # notified on Dependabot PRs, add a "reviewers" section to your dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 77e479e..197493f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,38 +1,39 @@ +# To learn more about Dependabot configuration at Chime, visit: http://go/dependabot-configuration version: 2 registries: github-octocat: type: git url: https://github.com username: x-access-token - password: "${{secrets.RUBYGEMS_SERVER_GITHUB_TOKEN}}" + password: "${{secrets.DEPENDABOT_GITHUB_TOKEN}}" updates: -- package-ecosystem: github-actions - directory: "/" - schedule: - interval: weekly - day: tuesday - time: '10:00' - timezone: America/Los_Angeles - pull-request-branch-name: - separator: "-" - commit-message: - prefix: "🔧 " - prefix-development: "🔧 " - include: scope - open-pull-requests-limit: 10 -- package-ecosystem: gomod - directory: "/" - schedule: - interval: weekly - day: tuesday - time: '10:00' - timezone: America/Los_Angeles - pull-request-branch-name: - separator: "-" - commit-message: - prefix: "⬆️ " - prefix-development: "⬆️ " - include: scope - open-pull-requests-limit: 10 - registries: - - github-octocat + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: weekly + day: tuesday + time: "10:00" + timezone: America/Los_Angeles + pull-request-branch-name: + separator: "-" + commit-message: + prefix: "🔧 " + prefix-development: "🔧 " + include: scope + open-pull-requests-limit: 10 + - package-ecosystem: gomod + directory: "/" + schedule: + interval: weekly + day: tuesday + time: "10:00" + timezone: America/Los_Angeles + pull-request-branch-name: + separator: "-" + commit-message: + prefix: "⬆️ " + prefix-development: "⬆️ " + include: scope + open-pull-requests-limit: 10 + registries: + - github-octocat diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 62ead70..8262a9d 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -15,5 +15,6 @@ jobs: - uses: actions/checkout@v4 - uses: ahmadnassri/action-dependabot-auto-merge@v2 with: - github-token: ${{ secrets.DEPENDABOT_AUTO_MERGE }} # 1debitops token + github-token: "${{ secrets.DEPENDABOT_AUTO_MERGE_GITHUB_TOKEN }}" # chime-dependency-bot user token config: .github/dependabot-auto-merge.config.yml + command: "squash and merge"