Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v5.0.119 into develop. #3341

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
48 changes: 22 additions & 26 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ on:
jobs:
envs:
name: envs
runs-on: ubuntu-20.04
steps:
##################################################################################################################
# Git checkout
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
# The github.ref is, for example, refs/tags/v5.0.145 or refs/tags/v5.0-r8
# Generate variables like:
# SRS_TAG=v5.0-r8
Expand All @@ -31,14 +30,15 @@ jobs:
echo "SRS_VERSION=$SRS_VERSION" >> $GITHUB_ENV
SRS_MAJOR=$(echo $SRS_TAG| cut -c 2)
echo "SRS_MAJOR=$SRS_MAJOR" >> $GITHUB_ENV
# Map a step output to a job output, see https://docs.github.com/en/actions/using-jobs/defining-outputs-for-jobs
outputs:
SRS_TAG: ${{ env.SRS_TAG }}
SRS_VERSION: ${{ env.SRS_VERSION }}
SRS_MAJOR: ${{ env.SRS_MAJOR }}
runs-on: ubuntu-20.04

test:
name: test
runs-on: ubuntu-20.04
needs:
- envs
steps:
Expand All @@ -51,7 +51,7 @@ jobs:
##################################################################################################################
# Git checkout
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
##################################################################################################################
# Tests
- name: Build test image
Expand All @@ -65,12 +65,10 @@ jobs:
docker run --rm srs:test bash -c 'make && \
./objs/srs -c conf/regression-test.conf && \
cd 3rdparty/srs-bench && make && ./objs/srs_test -test.v'
outputs:
SRS_TEST_DONE: ok
runs-on: ubuntu-20.04

draft:
name: draft
runs-on: ubuntu-20.04
needs:
- envs
steps:
Expand All @@ -84,12 +82,13 @@ jobs:
tag: ${{ github.ref }}
draft: true
prerelease: true
# Map a step output to a job output, see https://docs.github.com/en/actions/using-jobs/defining-outputs-for-jobs
outputs:
SRS_RELEASE_ID: ${{ steps.create_draft.outputs.id }}
runs-on: ubuntu-20.04

cygwin64:
name: cygwin64
runs-on: windows-latest
needs:
- envs
- draft
Expand All @@ -104,7 +103,7 @@ jobs:
install-dir: C:\cygwin64
##################################################################################################################
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
##################################################################################################################
- name: Covert output to env
env:
Expand Down Expand Up @@ -152,13 +151,14 @@ jobs:
with:
release_id: ${{ env.SRS_RELEASE_ID }}
assets_path: ${{ env.SRS_CYGWIN_TAR }}
# Map a step output to a job output, see https://docs.github.com/en/actions/using-jobs/defining-outputs-for-jobs
outputs:
SRS_CYGWIN_TAR: ${{ env.SRS_CYGWIN_TAR }}
SRS_CYGWIN_MD5: ${{ env.SRS_CYGWIN_MD5 }}
runs-on: windows-latest

linux:
name: linux
runs-on: ubuntu-20.04
needs:
- envs
- draft
Expand All @@ -173,7 +173,7 @@ jobs:
##################################################################################################################
# Git checkout
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
##################################################################################################################
# Create source tar for release. Note that it's for OpenWRT package srs-server, so the filename MUST be
# srs-server-xxx.tar.gz, because the package is named srs-server.
Expand Down Expand Up @@ -219,15 +219,16 @@ jobs:
with:
release_id: ${{ env.SRS_RELEASE_ID }}
assets_path: ${{ env.SRS_SOURCE_TAR }}
# Map a step output to a job output, see https://docs.github.com/en/actions/using-jobs/defining-outputs-for-jobs
outputs:
SRS_PACKAGE_ZIP: ${{ env.SRS_PACKAGE_ZIP }}
SRS_PACKAGE_MD5: ${{ env.SRS_PACKAGE_MD5 }}
SRS_SOURCE_TAR: ${{ env.SRS_SOURCE_TAR }}
SRS_SOURCE_MD5: ${{ env.SRS_SOURCE_MD5 }}
runs-on: ubuntu-20.04

docker-srs:
name: docker-srs
runs-on: ubuntu-20.04
needs:
- envs
steps:
Expand All @@ -240,14 +241,14 @@ jobs:
##################################################################################################################
# Git checkout
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
# See https://github.com/crazy-max/ghaction-docker-buildx#moved-to-docker-organization
# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
##################################################################################################################
# Create main images for Docker
- name: Login to docker hub
Expand All @@ -273,12 +274,10 @@ jobs:
ossrs/srs:${{ env.SRS_VERSION }}
ossrs/srs:${{ env.SRS_MAJOR }}
ossrs/srs:v${{ env.SRS_MAJOR }}
outputs:
SRS_DOCKER_DONE: ok
runs-on: ubuntu-20.04

aliyun-srs:
name: aliyun-srs
runs-on: ubuntu-20.04
needs:
- envs
- docker-srs
Expand Down Expand Up @@ -306,12 +305,10 @@ jobs:
registry.cn-hangzhou.aliyuncs.com/ossrs/srs:${{ env.SRS_VERSION }}
registry.cn-hangzhou.aliyuncs.com/ossrs/srs:${{ env.SRS_MAJOR }}
registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v${{ env.SRS_MAJOR }}
outputs:
SRS_ALIYUN_DONE: ok
runs-on: ubuntu-20.04

update:
name: update
runs-on: ubuntu-20.04
needs:
- aliyun-srs
- envs
Expand All @@ -325,7 +322,7 @@ jobs:
##################################################################################################################
# Git checkout
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
##################################################################################################################
# Generate variables like:
# SRS_LH_OSSRS_NET=1.2.3.4
Expand Down Expand Up @@ -373,12 +370,10 @@ jobs:
docker rmi -f $image
echo "Remove image $image, r0=$?"
done
outputs:
SRS_UPDATE_DONE: ok
runs-on: ubuntu-20.04

release:
name: release
runs-on: ubuntu-20.04
needs:
- update
- envs
Expand All @@ -402,7 +397,7 @@ jobs:
##################################################################################################################
# Git checkout
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
# Create release.
# TODO: FIXME: Refine the release when 5.0 released
# TODO: FIXME: Change prerelease to false when 5.0 released
Expand Down Expand Up @@ -448,6 +443,7 @@ jobs:
* [中文FAQ](https://ossrs.net/lts/zh-cn/faq), [功能列表](https://github.com/ossrs/srs/blob/${{ github.sha }}/trunk/doc/Features.md#features) 或 [修订历史](https://github.com/ossrs/srs/blob/${{ github.sha }}/trunk/doc/CHANGELOG.md#changelog)
draft: false
prerelease: true
runs-on: ubuntu-20.04

done:
name: done
Expand Down
Loading