Skip to content

Commit

Permalink
Windows: Merge develop, fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
winlinvip committed Nov 15, 2022
2 parents 2106e94 + be0241e commit d1eb59d
Show file tree
Hide file tree
Showing 2,191 changed files with 297,778 additions and 48,230 deletions.
12 changes: 12 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: srs-server
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
42 changes: 0 additions & 42 deletions .github/ISSUE_TEMPLATE

This file was deleted.

43 changes: 43 additions & 0 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

> Note: Please read FAQ before file an issue, see 2716
> Note: 提问前,请先看FAQ, 即 2716
**Description(描述)**

> Please description your issue here(描述你遇到了什么问题)
1. SRS Version(版本): `xxxxxx`

1. SRS Log(日志):

```
xxxxxxxxxxxx
```

1. SRS Config(配置):

```
xxxxxxxxxxxx
```

**Replay(重现)**

> Please describe how to replay the bug? (重现Bug的步骤)
1. `xxxxxx`
1. `xxxxxx`
1. `xxxxxx`

**Expect(期望行为)**

> Please describe your expectation(描述你期望发生的事情)
5 changes: 5 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Please describe the summary for this PR.

1. Add more details about this PR.
1. Add more details about this PR.
1. Add more details about this PR.
9 changes: 6 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@ jobs:

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

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

0 comments on commit d1eb59d

Please sign in to comment.