Skip to content

Commit 2d641e1

Browse files
authored
Merge branch 'main' into justafish/support-nektos-act
2 parents 9a0db35 + a2b5d84 commit 2d641e1

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

.github/workflows/dependabot.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ jobs:
1212
pull-requests: write
1313
steps:
1414
- uses: actions/checkout@v4
15-
- uses: actions/setup-node@v3
15+
- uses: actions/setup-node@v4
1616
with:
1717
node-version: 18
1818
cache: npm
1919
- name: Checkout PR
2020
run: gh pr checkout ${{ github.event.pull_request.number }}
21+
env:
22+
GITHUB_TOKEN: ${{ github.token }}
2123
- run: npm install
2224
- name: Git config
2325
run: |
@@ -39,3 +41,4 @@ jobs:
3941
run: gh pr merge --auto --merge "$PR_URL"
4042
env:
4143
PR_URL: ${{ github.event.pull_request.html_url }}
44+
GITHUB_TOKEN: ${{ github.token }}

.github/workflows/main.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
1-
on: [push, pull_request, workflow_dispatch]
21
name: tests
32

3+
on:
4+
pull_request:
5+
merge_group:
6+
types: [checks_requested]
7+
push:
8+
branches:
9+
- 'main'
10+
workflow_dispatch:
11+
schedule:
12+
- cron: 0 0 * * *
13+
414
jobs:
515
test:
616
runs-on: ${{ matrix.os }}

0 commit comments

Comments
 (0)