diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 55ae20da8df..6b3532f7f31 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,18 +9,22 @@ updates: directory: "/" schedule: interval: "weekly" + target-branch: "dependabot-updates" - package-ecosystem: "docker" directory: "/lambdas/thumbnail" schedule: interval: "daily" + target-branch: "dependabot-updates" - package-ecosystem: "docker" directory: "/catalog" schedule: interval: "daily" + target-branch: "dependabot-updates" - package-ecosystem: "docker" directory: "/s3-proxy" schedule: interval: "daily" + target-branch: "dependabot-updates" diff --git a/.github/workflows/dependabot-merge.yaml b/.github/workflows/dependabot-merge.yaml new file mode 100644 index 00000000000..62ef7bc29c4 --- /dev/null +++ b/.github/workflows/dependabot-merge.yaml @@ -0,0 +1,32 @@ +on: + push: + branches: + - master + - dependabot-updates # Add Dependabot updates branch + tags: + - "*" + pull_request: + +jobs: + dependabot-auto-merge: + runs-on: ubuntu-latest + if: github.ref == 'refs/heads/dependabot-updates' + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.11' + - name: Install dependencies + run: | + python -m pip install --upgrade pip setuptools + python -m pip install -r requirements.txt + - name: Run tests + run: pytest + - name: Auto-merge into integration branch + if: success() + run: | + git config user.name "devops-automation[bot]" + git config user.email "dev@quiltdata.io" + git checkout -b dependabot-integration + git merge --no-ff dependabot-updates -m "Auto-merge Dependabot updates" + git push origin dependabot-integration