Skip to content

Commit 252151c

Browse files
ymc9ymc9
authored
fix: merge errors in github workflow files and formatting issues (#1022)
2 parents d296e5f + 6867e79 commit 252151c

File tree

6 files changed

+301
-315
lines changed

6 files changed

+301
-315
lines changed

‎.github/dependabot.yml

Lines changed: 114 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,118 @@
1-
21
version: 2
32
updates:
4-
- package-ecosystem: "npm"
5-
schedule:
6-
interval: "daily"
7-
time: "02:00"
8-
commit-message:
9-
prefix: ":arrow_up: maint"
10-
include: scope
11-
directory: "/"
3+
- package-ecosystem: 'npm'
4+
schedule:
5+
interval: 'daily'
6+
time: '02:00'
7+
commit-message:
8+
prefix: ':arrow_up: maint'
9+
include: scope
10+
directory: '/'
11+
12+
- package-ecosystem: 'npm'
13+
schedule:
14+
interval: 'daily'
15+
time: '02:00'
16+
commit-message:
17+
prefix: ':arrow_up: maint'
18+
include: scope
19+
directory: '/packages/ide/jetbrains'
20+
21+
- package-ecosystem: 'npm'
22+
schedule:
23+
interval: 'daily'
24+
time: '02:00'
25+
commit-message:
26+
prefix: ':arrow_up: maint'
27+
include: scope
28+
directory: '/packages/language'
29+
30+
- package-ecosystem: 'npm'
31+
schedule:
32+
interval: 'daily'
33+
time: '02:00'
34+
commit-message:
35+
prefix: ':arrow_up: maint'
36+
include: scope
37+
directory: '/packages/misc/redwood'
38+
39+
- package-ecosystem: 'npm'
40+
schedule:
41+
interval: 'daily'
42+
time: '02:00'
43+
commit-message:
44+
prefix: ':arrow_up: maint'
45+
include: scope
46+
directory: '/packages/plugins/openapi'
47+
48+
- package-ecosystem: 'npm'
49+
schedule:
50+
interval: 'daily'
51+
time: '02:00'
52+
commit-message:
53+
prefix: ':arrow_up: maint'
54+
include: scope
55+
directory: '/packages/plugins/swr'
56+
57+
- package-ecosystem: 'npm'
58+
schedule:
59+
interval: 'daily'
60+
time: '02:00'
61+
commit-message:
62+
prefix: ':arrow_up: maint'
63+
include: scope
64+
directory: '/packages/plugins/tanstack-query'
65+
66+
- package-ecosystem: 'npm'
67+
schedule:
68+
interval: 'daily'
69+
time: '02:00'
70+
commit-message:
71+
prefix: ':arrow_up: maint'
72+
include: scope
73+
directory: '/packages/plugins/trpc'
74+
75+
- package-ecosystem: 'npm'
76+
schedule:
77+
interval: 'daily'
78+
time: '02:00'
79+
commit-message:
80+
prefix: ':arrow_up: maint'
81+
include: scope
82+
directory: '/packages/runtime'
83+
84+
- package-ecosystem: 'npm'
85+
schedule:
86+
interval: 'daily'
87+
time: '02:00'
88+
commit-message:
89+
prefix: ':arrow_up: maint'
90+
include: scope
91+
directory: '/packages/sdk'
92+
93+
- package-ecosystem: 'npm'
94+
schedule:
95+
interval: 'daily'
96+
time: '02:00'
97+
commit-message:
98+
prefix: ':arrow_up: maint'
99+
include: scope
100+
directory: '/packages/server'
12101

13-
- package-ecosystem: "npm"
14-
schedule:
15-
interval: "daily"
16-
time: "02:00"
17-
commit-message:
18-
prefix: ":arrow_up: maint"
19-
include: scope
20-
directory: "/packages/ide/jetbrains"
21-
22-
- package-ecosystem: "npm"
23-
schedule:
24-
interval: "daily"
25-
time: "02:00"
26-
commit-message:
27-
prefix: ":arrow_up: maint"
28-
include: scope
29-
directory: "/packages/language"
30-
31-
- package-ecosystem: "npm"
32-
schedule:
33-
interval: "daily"
34-
time: "02:00"
35-
commit-message:
36-
prefix: ":arrow_up: maint"
37-
include: scope
38-
directory: "/packages/misc/redwood"
39-
40-
- package-ecosystem: "npm"
41-
schedule:
42-
interval: "daily"
43-
time: "02:00"
44-
commit-message:
45-
prefix: ":arrow_up: maint"
46-
include: scope
47-
directory: "/packages/plugins/openapi"
48-
49-
- package-ecosystem: "npm"
50-
schedule:
51-
interval: "daily"
52-
time: "02:00"
53-
commit-message:
54-
prefix: ":arrow_up: maint"
55-
include: scope
56-
directory: "/packages/plugins/swr"
57-
58-
- package-ecosystem: "npm"
59-
schedule:
60-
interval: "daily"
61-
time: "02:00"
62-
commit-message:
63-
prefix: ":arrow_up: maint"
64-
include: scope
65-
directory: "/packages/plugins/tanstack-query"
66-
67-
- package-ecosystem: "npm"
68-
schedule:
69-
interval: "daily"
70-
time: "02:00"
71-
commit-message:
72-
prefix: ":arrow_up: maint"
73-
include: scope
74-
directory: "/packages/plugins/trpc"
75-
76-
- package-ecosystem: "npm"
77-
schedule:
78-
interval: "daily"
79-
time: "02:00"
80-
commit-message:
81-
prefix: ":arrow_up: maint"
82-
include: scope
83-
directory: "/packages/runtime"
84-
85-
- package-ecosystem: "npm"
86-
schedule:
87-
interval: "daily"
88-
time: "02:00"
89-
commit-message:
90-
prefix: ":arrow_up: maint"
91-
include: scope
92-
directory: "/packages/sdk"
93-
94-
- package-ecosystem: "npm"
95-
schedule:
96-
interval: "daily"
97-
time: "02:00"
98-
commit-message:
99-
prefix: ":arrow_up: maint"
100-
include: scope
101-
directory: "/packages/server"
102-
103-
- package-ecosystem: "npm"
104-
schedule:
105-
interval: "daily"
106-
time: "02:00"
107-
commit-message:
108-
prefix: ":arrow_up: maint"
109-
include: scope
110-
directory: "/packages/testtools"
102+
- package-ecosystem: 'npm'
103+
schedule:
104+
interval: 'daily'
105+
time: '02:00'
106+
commit-message:
107+
prefix: ':arrow_up: maint'
108+
include: scope
109+
directory: '/packages/testtools'
111110

112-
- package-ecosystem: "github-actions"
113-
schedule:
114-
interval: "daily"
115-
time: "02:00"
116-
commit-message:
117-
prefix: ":arrow_up: maint"
118-
include: scope
119-
directory: "/"
111+
- package-ecosystem: 'github-actions'
112+
schedule:
113+
interval: 'daily'
114+
time: '02:00'
115+
commit-message:
116+
prefix: ':arrow_up: maint'
117+
include: scope
118+
directory: '/'

‎.github/workflows/build-test.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ env:
88
DO_NOT_TRACK: '1'
99

1010
on:
11-
merge_group:
12-
push:
13-
branches:
14-
- main
15-
- dev
16-
- release/*
17-
- v2
18-
pull_request:
19-
branches:
20-
- main
21-
- dev
22-
- release/*
23-
- v2
11+
merge_group:
12+
push:
13+
branches:
14+
- main
15+
- dev
16+
- release/*
17+
- v2
18+
pull_request:
19+
branches:
20+
- main
21+
- dev
22+
- release/*
23+
- v2
2424

2525
permissions:
26-
contents: read
26+
contents: read
2727

2828
jobs:
2929
build-test:

‎.github/workflows/security-defender-for-devops.yml

Lines changed: 41 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
2-
# This workflow uses actions that are not certified by GitHub.
3-
# They are provided by a third-party and are governed by
4-
# separate terms of service, privacy policy, and support
5-
# documentation.
6-
#
71
# Microsoft Security DevOps (MSDO) is a command line application which integrates static analysis tools into the development cycle.
82
# MSDO installs, configures and runs the latest versions of static analysis tools
93
# (including, but not limited to, SDL/security and compliance tools).
@@ -20,53 +14,53 @@
2014
name: Security - Microsoft Defender For Devops
2115

2216
on:
23-
merge_group:
24-
push:
25-
branches:
26-
- main
27-
- dev
28-
- release/*
29-
- v2
30-
pull_request:
31-
branches:
32-
- main
33-
- dev
34-
- release/*
35-
- v2
36-
schedule:
37-
- cron: '34 12 * * 0'
17+
merge_group:
18+
push:
19+
branches:
20+
- main
21+
- dev
22+
- release/*
23+
- v2
24+
pull_request:
25+
branches:
26+
- main
27+
- dev
28+
- release/*
29+
- v2
30+
schedule:
31+
- cron: '34 12 * * 0'
3832

3933
permissions:
40-
contents: read
41-
security-events: read
34+
contents: read
35+
security-events: read
4236

4337
jobs:
44-
MSDO:
45-
# currently only windows latest is supported
46-
runs-on: windows-latest
47-
permissions:
48-
security-events: write
38+
MSDO:
39+
# currently only windows latest is supported
40+
runs-on: windows-latest
41+
permissions:
42+
security-events: write
4943

50-
steps:
51-
- name: Harden Runner
52-
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
53-
with:
54-
egress-policy: audit
44+
steps:
45+
- name: Harden Runner
46+
uses: step-security/harden-runner@v2.6.1
47+
with:
48+
egress-policy: audit
5549

56-
# checks out the repository
57-
- uses: actions/checkout@v4
50+
# checks out the repository
51+
- uses: actions/checkout@v4
5852

59-
- uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
60-
with:
61-
dotnet-version: |
62-
5.0.x
63-
6.0.x
53+
- uses: actions/setup-dotnet@v3.2.0
54+
with:
55+
dotnet-version: |
56+
5.0.x
57+
6.0.x
6458
65-
- name: Run Microsoft Security DevOps
66-
uses: microsoft/security-devops-action@v1.6.0
67-
id: msdo
59+
- name: Run Microsoft Security DevOps
60+
uses: microsoft/security-devops-action@v1.6.0
61+
id: msdo
6862

69-
- name: Upload results to Security tab
70-
uses: github/codeql-action/upload-sarif@1500a131381b66de0c52ac28abb13cd79f4b7ecc # v2.22.12
71-
with:
72-
sarif_file: ${{ steps.msdo.outputs.sarifFile }}
63+
- name: Upload results to Security tab
64+
uses: github/codeql-action/upload-sarif@v2.22.12
65+
with:
66+
sarif_file: ${{ steps.msdo.outputs.sarifFile }}

0 commit comments

Comments
 (0)