Skip to content

Commit d1eb59d

Browse files
committed
Windows: Merge develop, fix conflicts
2 parents 2106e94 + be0241e commit d1eb59d

File tree

2,191 files changed

+297778
-48230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,191 files changed

+297778
-48230
lines changed

.github/FUNDING.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# These are supported funding model platforms
2+
3+
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: # Replace with a single Patreon username
5+
open_collective: srs-server
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
otechie: # Replace with a single Otechie username
12+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE

Lines changed: 0 additions & 42 deletions
This file was deleted.

.github/issue_template.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
> Note: Please read FAQ before file an issue, see 2716
11+
12+
> Note: 提问前,请先看FAQ, 即 2716
13+
14+
**Description(描述)**
15+
16+
> Please description your issue here(描述你遇到了什么问题)
17+
18+
1. SRS Version(版本): `xxxxxx`
19+
20+
1. SRS Log(日志):
21+
22+
```
23+
xxxxxxxxxxxx
24+
```
25+
26+
1. SRS Config(配置):
27+
28+
```
29+
xxxxxxxxxxxx
30+
```
31+
32+
**Replay(重现)**
33+
34+
> Please describe how to replay the bug? (重现Bug的步骤)
35+
36+
1. `xxxxxx`
37+
1. `xxxxxx`
38+
1. `xxxxxx`
39+
40+
**Expect(期望行为)**
41+
42+
> Please describe your expectation(描述你期望发生的事情)
43+

.github/pull_request_template.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Please describe the summary for this PR.
2+
3+
1. Add more details about this PR.
4+
1. Add more details about this PR.
5+
1. Add more details about this PR.

.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,16 @@ jobs:
1919

2020
# Initializes the CodeQL tools for scanning.
2121
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@v1
22+
uses: github/codeql-action/init@v2
2323
with:
2424
languages: ${{ matrix.language }}
2525

2626
- name: Build SRS
2727
run: |
28-
cd trunk && ./configure && make
28+
echo "pwd: $(pwd), who: $(whoami)"
29+
docker run --rm -v $(pwd):$(pwd) -w $(pwd)/trunk ossrs/srs:ubuntu20-cache \
30+
bash -c "./configure --jobs=2 && chmod 777 -R objs"
31+
cd trunk && ./configure --jobs=2 && make -j2
2932
3033
- name: Perform CodeQL Analysis
31-
uses: github/codeql-action/analyze@v1
34+
uses: github/codeql-action/analyze@v2

0 commit comments

Comments
 (0)