Skip to content

Commit fc7cc9b

Browse files
committed
fix: resolve merge conflicts []
2 parents 06474d8 + c63c0e6 commit fc7cc9b

File tree

3 files changed

+35
-3
lines changed

3 files changed

+35
-3
lines changed

.github/workflows/codeql.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: "CodeQL Scan for GitHub Actions Workflows"
3+
4+
on:
5+
push:
6+
branches: [master]
7+
paths: [".github/workflows/**"]
8+
pull_request:
9+
branches: [master]
10+
paths: [".github/workflows/**"]
11+
12+
jobs:
13+
analyze:
14+
name: Analyze GitHub Actions workflows
15+
runs-on: ubuntu-latest
16+
permissions:
17+
actions: read
18+
contents: read
19+
security-events: write
20+
21+
steps:
22+
- uses: actions/checkout@v4
23+
24+
- name: Initialize CodeQL
25+
uses: github/codeql-action/init@v3
26+
with:
27+
languages: actions
28+
29+
- name: Run CodeQL Analysis
30+
uses: github/codeql-action/analyze@v3
31+
with:
32+
category: actions

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"dist"
4646
],
4747
"dependencies": {
48-
"axios": "^1.11.0",
48+
"axios": "^1.12.2",
4949
"fast-copy": "^3.0.2",
5050
"lodash-es": "^4.17.21",
5151
"p-throttle": "^8.0.0",
@@ -136,4 +136,4 @@
136136
"optionalDependencies": {
137137
"@rollup/rollup-linux-x64-gnu": "^4.18.0"
138138
}
139-
}
139+
}

0 commit comments

Comments
 (0)