Skip to content

Commit 1077763

Browse files
committed
Various config updates
1 parent 3d405cb commit 1077763

File tree

5 files changed

+219
-320
lines changed

5 files changed

+219
-320
lines changed

Diff for: .github/dependabot.yml

+4
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "daily"
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
interval: "daily"

Diff for: .github/workflows/auto-merge.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Dependabot auto-merge
2+
on: pull_request
3+
4+
permissions:
5+
contents: write
6+
pull-requests: write
7+
8+
jobs:
9+
dependabot:
10+
runs-on: ubuntu-latest
11+
if: ${{ github.actor == 'dependabot[bot]' }}
12+
steps:
13+
- name: Dependabot metadata
14+
id: metadata
15+
uses: dependabot/[email protected]
16+
with:
17+
github-token: "${{ secrets.GITHUB_TOKEN }}"
18+
- name: Enable auto-merge for Dependabot PRs
19+
run: gh pr merge --auto --merge "$PR_URL"
20+
env:
21+
PR_URL: ${{github.event.pull_request.html_url}}
22+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

Diff for: .github/workflows/main.yml

+3-16
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: Main
2+
23
on:
34
- push
4-
- pull_request_target
5+
- pull_request
6+
57
jobs:
68
ci:
79
name: CI
@@ -21,18 +23,3 @@ jobs:
2123
yarn lint
2224
yarn prettier --check '**/*'
2325
yarn test
24-
25-
automerge:
26-
name: AutoMerge
27-
needs: ci
28-
runs-on: ubuntu-latest
29-
if: github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
30-
steps:
31-
- uses: actions/github-script@v3
32-
with:
33-
script: |
34-
github.pulls.merge({
35-
owner: context.payload.repository.owner.login,
36-
repo: context.payload.repository.name,
37-
pull_number: context.payload.pull_request.number
38-
})

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"devDependencies": {
3535
"@types/aria-query": "^5.0.0",
3636
"@types/eslint-scope": "^3.7.2",
37-
"@types/jest": "^29.2.0",
37+
"@types/jest": "^29.2.5",
3838
"@types/node": "^18.0.0",
3939
"@typescript-eslint/eslint-plugin": "^5.10.2",
4040
"@typescript-eslint/parser": "^5.10.2",

0 commit comments

Comments
 (0)