Skip to content

Commit 250dd25

Browse files
authored
Merge branch 'dev' into dependabot/npm_and_yarn/multi-a28ee524ce
2 parents b14bf82 + 5fa8394 commit 250dd25

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.github/workflows/dependabot_automerge.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ on:
55

66
jobs:
77
auto-merge:
8+
# if: github.actor == 'dependabot[bot]'
89
runs-on: ubuntu-latest
910
steps:
11+
- run: echo ${GITHUB_ACTOR}
1012
- uses: actions/checkout@v2
1113
- uses: ahmadnassri/action-dependabot-auto-merge@v2
1214
with:
1315
target: minor
14-
github-token: ${{ secrets.mytoken }}
16+
github-token: ${{ secrets.MYTOKEN }}

package-lock.json

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"ts-node": "^10.9.1",
8181
"tsify": "^5.0.4",
8282
"typeconv": "^2.3.1",
83-
"typescript": "^5.5.3",
83+
"typescript": "^5.9.3",
8484
"typescript-eslint": "^8.0.0-alpha.39",
8585
"vinyl-buffer": "^1.0.1",
8686
"vinyl-source-stream": "^2.0.0"

0 commit comments

Comments
 (0)