Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into mid
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/Http/HttpFileManager.cpp
#	src/Rtp/RtpSender.cpp
  • Loading branch information
baiyfcu committed Sep 10, 2024
2 parents 71668ba + 531a987 commit be7effa
Show file tree
Hide file tree
Showing 225 changed files with 7,570 additions and 3,970 deletions.
24 changes: 17 additions & 7 deletions .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ assignees: ''
* https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax
-->

### 现象描述
## 现象描述

<!--
在使用什么功能产生的问题? 其异常表现是什么?
如: 在测试 WebRTC 功能时, 使用 Chrome 浏览器访问 ZLMediait 自带网页播放 FFmpeg 以 RTSP 协议推送的图像有卡顿/花屏.
-->

### 如何复现?
## 如何复现?

<!--
明确的复现步骤对快速解决问题极有帮助.
Expand All @@ -37,7 +37,7 @@ assignees: ''
1. 期望 ..., 结果 ...
-->

### 相关日志或截图
## 相关日志或截图

<!--
由于日志通长较长, 建议将日志信息填写到下面的 "日志内容..."
Expand All @@ -50,11 +50,14 @@ assignees: ''
<details>
<summary>展开查看详细日志</summary>
<pre>
日志内容...

```
#详细日志粘在这里!
```
</pre>
</details>

### 配置
## 配置

<!--
部分常见问题是由于配置错误导致的, 建议仔细阅读配置文件中的注释信息
Expand All @@ -65,11 +68,14 @@ assignees: ''
<details>
<summary>展开查看详细配置</summary>
<pre>
配置内容...

```ini
#config.ini内容粘在这里!
```
</pre>
</details>

### 各种环境信息
## 各种环境信息

<!--
请填写相关环境信息, 详细的环境信息有助于快速复现定位问题.
Expand All @@ -82,4 +88,8 @@ assignees: ''
* **代码提交记录/git commit hash**:
* **操作系统及版本**:
* **硬件信息**:
* **crash backtrace**:
```
#崩溃信息backtrace粘贴至此
```
* **其他需要补充的信息**:
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/compile.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ assignees: ''
* https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax
-->

### 相关日志及环境信息
## 相关日志及环境信息

<!--
由于编译日志通长较长, 建议将日志信息填写到下面 `````` block 内,或者上传日志文件
Expand All @@ -41,7 +41,7 @@ assignees: ''

编译目录下的 `CMakeCache.txt` 文件内容,请直接上传为附件。

### 各种环境信息
## 各种环境信息

<!--
请填写相关环境信息, 详细的环境信息有助于快速复现定位问题.
Expand Down
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
blank_issues_enabled: false

contact_links:
- name: 技术咨询
url: https://t.zsxq.com/FcVK5
about: 请在知识星球发起技术咨询
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/feature.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ assignees: ''

---

**描述该功能的用处,可以提供相关资料描述该功能**
## 描述该功能的用处,可以提供相关资料描述该功能

**该功能是否用于改进项目缺陷,如果是,请描述现有缺陷**
## 该功能是否用于改进项目缺陷,如果是,请描述现有缺陷

**描述你期望实现该功能的方式和最终效果**
## 描述你期望实现该功能的方式和最终效果
19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/question.md

This file was deleted.

8 changes: 0 additions & 8 deletions .github/ISSUE_TEMPLATE/requirement.md

This file was deleted.

34 changes: 34 additions & 0 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,37 @@ jobs:

- name: 编译
run: cd Android && ./gradlew build

- name: 设置环境变量
run: |
echo "BRANCH=$(echo ${GITHUB_REF#refs/heads/} | tr -s "/\?%*:|\"<>" "_")" >> $GITHUB_ENV
echo "BRANCH2=$(echo ${GITHUB_REF#refs/heads/} )" >> $GITHUB_ENV
echo "DATE=$(date +%Y-%m-%d)" >> $GITHUB_ENV
- name: 打包二进制
id: upload
uses: actions/upload-artifact@v4
with:
name: ${{ github.workflow }}_${{ env.BRANCH }}_${{ env.DATE }}
path: Android/app/build/outputs/apk/debug/*
if-no-files-found: error
retention-days: 90

- name: issue评论
if: github.event_name != 'pull_request' && github.ref != 'refs/heads/feature/test'
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.issues.createComment({
issue_number: ${{vars.VERSION_ISSUE_NO}},
owner: context.repo.owner,
repo: context.repo.repo,
body: '- 下载地址: [${{ github.workflow }}_${{ env.BRANCH }}_${{ env.DATE }}](${{ steps.upload.outputs.artifact-url }})\n'
+ '- 分支: ${{ env.BRANCH2 }}\n'
+ '- git hash: ${{ github.sha }} \n'
+ '- 编译日期: ${{ env.DATE }}\n'
+ '- 编译记录: [${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})\n'
+ '- 开启特性: 未开启openssl/webrtc/datachannel等功能\n'
+ '- 打包ci名: ${{ github.workflow }}\n'
})
11 changes: 2 additions & 9 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ on:
- "feature/*"
- "release/*"

pull_request:
branches:
- "master"
- "feature/*"
- "release/*"

env:
# Use docker.io for Docker Hub if empty
REGISTRY: docker.io
Expand All @@ -21,7 +15,7 @@ env:
jobs:
build:

runs-on: ubuntu-latest
runs-on: ubuntu-20.04
permissions:
contents: read
packages: write
Expand All @@ -39,7 +33,6 @@ jobs:
# Install the cosign tool except on PR
# https://github.com/sigstore/cosign-installer
- name: Install cosign
if: github.event_name != 'pull_request'
uses: sigstore/cosign-installer@d572c9c13673d2e0a26fabf90b5748f36886883f

- name: Set up QEMU
Expand All @@ -53,7 +46,6 @@ jobs:
# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
with:
registry: ${{ env.REGISTRY }}
Expand All @@ -71,6 +63,7 @@ jobs:
# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
if: github.event_name != 'pull_request' && github.ref != 'refs/heads/feature/test'
id: build-and-push
uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
with:
Expand Down
58 changes: 58 additions & 0 deletions .github/workflows/issue_lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: issue_lint

on:
issues:
types: [opened]

jobs:
issue_lint:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3

- uses: actions/github-script@v6
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const fs = require('fs').promises;
const getTitles = (str) => (
[...str.matchAll(/^## (.*)/gm)].map((m) => m[0])
);
const titles = getTitles(context.payload.issue.body);
for (let file of await fs.readdir('.github/ISSUE_TEMPLATE')) {
if (!file.endsWith('.md')) {
continue;
}
const template = await fs.readFile(`.github/ISSUE_TEMPLATE/${file}`, 'utf-8');
const templateTitles = getTitles(template);
if (templateTitles.every((title) => titles.includes(title))) {
process.exit(0);
}
}
await github.rest.issues.createComment({
owner: context.issue.owner,
repo: context.issue.repo,
issue_number: context.issue.number,
body: '此issue由于不符合模板规范已经自动关闭,请重新按照模板规范确保包含模板中所有章节标题再提交\n',
});
await github.rest.issues.addLabels({
owner: context.issue.owner,
repo: context.issue.repo,
issue_number: context.issue.number,
labels: ['自动关闭']
});

await github.rest.issues.update({
owner: context.issue.owner,
repo: context.issue.repo,
issue_number: context.issue.number,
state: 'closed',
});
Loading

0 comments on commit be7effa

Please sign in to comment.