From bae32e90952a0e1b66fd6ff41e590998ae443ea8 Mon Sep 17 00:00:00 2001 From: mwtian <81660174+mwtian@users.noreply.github.com> Date: Tue, 9 May 2023 14:56:10 -0700 Subject: [PATCH] [CI] allow automatic merging of github action updates (#11868) ## Description Otherwise it takes effort to approve individual github workflow action updates. Also, make dependabot run more frequently to catch up on backlogs. ## Test Plan CI --- If your changes are not user-facing and not a breaking change, you can skip the following section. Otherwise, please indicate what changed, and then add to the Release Notes section as highlighted during the release process. ### Type of Change (Check all that apply) - [ ] user-visible impact - [ ] breaking change for a client SDKs - [ ] breaking change for FNs (FN binary must upgrade) - [ ] breaking change for validators or node operators (must upgrade binaries) - [ ] breaking change for on-chain data layout - [ ] necessitate either a data wipe or data migration ### Release notes --- .github/auto-merge.yml | 4 ++++ .github/dependabot.yml | 6 +++--- .github/workflows/dependabot-auto-merge.yml | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .github/auto-merge.yml diff --git a/.github/auto-merge.yml b/.github/auto-merge.yml new file mode 100644 index 00000000000..d2eaf0d182d --- /dev/null +++ b/.github/auto-merge.yml @@ -0,0 +1,4 @@ +# Update Github actions automatically +- match: + dependency_type: production + update_type: all diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 64717d8944c..79976b14b26 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,14 +7,14 @@ updates: - package-ecosystem: "cargo" directory: "/" schedule: - interval: "weekly" + interval: "daily" - package-ecosystem: "npm" directory: "/" schedule: - interval: "weekly" + interval: "daily" - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "weekly" \ No newline at end of file + interval: "daily" \ No newline at end of file diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 4315047fe7c..d0c989ac54a 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -44,7 +44,8 @@ jobs: git remote set-url origin https://x-access-token:${{ secrets.AUTOMERGE_TOKEN }}@github.com/${{ github.repository }} git commit -am "chore(deps): cargo hakari" git push - - uses: ahmadnassri/action-dependabot-auto-merge@45fc124d949b19b6b8bf6645b6c9d55f4f9ac61a # pin@v2.6 + - name: Dependabot Auto Merge + uses: ahmadnassri/action-dependabot-auto-merge@v2.6.6 with: github-token: ${{ secrets.AUTOMERGE_TOKEN }} command: 'squash and merge'