Skip to content

Commit cc3cf18

Browse files
authored
feat(TU-35931): Enable automerge on mondays (#730)
1 parent a25bcb8 commit cc3cf18

3 files changed

Lines changed: 73 additions & 20 deletions

File tree

.github/dependabot.yml

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,41 @@
11
version: 2
22

3+
registries:
4+
npm-github:
5+
type: npm-registry
6+
url: https://npm.pkg.github.com
7+
token: ${{ secrets.GH_TOKEN }}
8+
git-github:
9+
type: git
10+
url: https://github.com
11+
username: x-access-token
12+
password: '${{ secrets.GH_TOKEN }}'
13+
314
updates:
415
- package-ecosystem: npm
5-
registries:
6-
- gh-packages
7-
directory: '/'
816
schedule:
917
interval: weekly
10-
versioning-strategy: increase
11-
allow:
12-
- dependency-name: '@typeform*'
13-
commit-message:
14-
prefix: 'chore'
15-
include: 'scope'
16-
labels:
17-
- 'dependabot'
18+
day: monday
1819
groups:
19-
typeform:
20+
dependencies:
2021
patterns:
21-
- '@typeform*'
22-
23-
registries:
24-
gh-packages:
25-
type: npm-registry
26-
url: https://npm.pkg.github.com
27-
token: ${{ secrets.GH_TOKEN }}
22+
- "*"
23+
directories:
24+
- "/"
25+
commit-message:
26+
prefix: fix(dependabot)
27+
registries:
28+
- npm-github
29+
- git-github
2830

31+
- package-ecosystem: github-actions
32+
schedule:
33+
interval: weekly
34+
day: monday
35+
groups:
36+
dependencies:
37+
patterns:
38+
- "*"
39+
directory: "/"
40+
commit-message:
41+
prefix: build(dependabot)
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Dependabot auto-approve and auto-merge
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, synchronize, reopened]
6+
7+
permissions:
8+
pull-requests: write
9+
contents: write
10+
11+
jobs:
12+
dependabot:
13+
runs-on: [self-hosted, ci-universal]
14+
if: github.actor == 'dependabot[bot]'
15+
16+
steps:
17+
- name: Checkout Repo
18+
uses: actions/checkout@v5
19+
with:
20+
fetch-depth: 1
21+
22+
- name: Install GitHub CLI
23+
run: |
24+
sudo apt-get update
25+
sudo apt-get install -y gh
26+
27+
- name: Authenticate gh
28+
run: echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
29+
30+
- name: Approve dependabot PRs
31+
run: gh pr review --approve "$PR_URL"
32+
env:
33+
PR_URL: ${{ github.event.pull_request.html_url }}
34+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35+
36+
- name: Merge for dependabot PRs
37+
run: gh pr merge --auto --squash "$PR_URL"
38+
env:
39+
PR_URL: ${{ github.event.pull_request.html_url }}
40+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

packages/demo-nextjs/next-env.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
/// <reference types="next/navigation-types/compat/navigation" />
44

55
// NOTE: This file should not be edited
6-
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
6+
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

0 commit comments

Comments
 (0)