From cd85a96255ae68731872a9a5815baa87283b18a0 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 29 Jun 2022 20:32:47 +0800 Subject: [PATCH] Update SRS image for r.ossrs.net --- .github/workflows/release.yml | 30 ++++++++++++++++++++++++---- README.md | 1 + trunk/doc/CHANGELOG.md | 1 + trunk/src/core/srs_core_version4.hpp | 2 +- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 918f87a027..cc85696891 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -344,16 +344,18 @@ jobs: ################################################################################################################## ################################################################################################################## # Generate variables like: - # SRS_DROPLET_EIP=1.2.3.4 + # SRS_LH_OSSRS_NET=1.2.3.4 - name: Build variables for lh.ossrs.net run: | - SRS_DROPLET_EIP=$(dig +short lh.ossrs.net) - echo "SRS_DROPLET_EIP=$SRS_DROPLET_EIP" >> $GITHUB_ENV + SRS_LH_OSSRS_NET=$(dig +short lh.ossrs.net) + SRS_R_OSSRS_NET=$(dig +short r.ossrs.net) + echo "SRS_LH_OSSRS_NET=$SRS_LH_OSSRS_NET" >> $GITHUB_ENV + echo "SRS_R_OSSRS_NET=$SRS_R_OSSRS_NET" >> $GITHUB_ENV - name: Release to lh.ossrs.net uses: appleboy/ssh-action@master with: - host: ${{ env.SRS_DROPLET_EIP }} + host: ${{ env.SRS_LH_OSSRS_NET }} username: root key: ${{ secrets.DIGITALOCEAN_SSHKEY }} port: 22 @@ -370,6 +372,26 @@ jobs: echo "Remove image $image, r0=$?" done + - name: Release to r.ossrs.net + uses: appleboy/ssh-action@master + with: + host: ${{ env.SRS_R_OSSRS_NET }} + username: root + key: ${{ secrets.DIGITALOCEAN_SSHKEY }} + port: 22 + envs: SRS_MAJOR + timeout: 60s + command_timeout: 30m + script: | + docker pull ossrs/srs:$SRS_MAJOR + docker rm -f srs-server + # + # Cleanup old docker images. + for image in $(docker images |grep '' |awk '{print $3}'); do + docker rmi -f $image + echo "Remove image $image, r0=$?" + done + release: name: release runs-on: ubuntu-20.04 diff --git a/README.md b/README.md index a1db15bc97..4530f5a240 100755 --- a/README.md +++ b/README.md @@ -131,6 +131,7 @@ A big THANK YOU goes to: ## Releases +* 2022-06-29, Release [v4.0-r1](https://github.com/ossrs/srs/releases/tag/v4.0-r1), v4.0-r1, 4.0 release1, v4.0.253, 144680 lines. * 2022-06-11, Release [v4.0-r0](https://github.com/ossrs/srs/releases/tag/v4.0-r0), v4.0-r0, 4.0 release0, v4.0.252, 144680 lines. * 2022-03-19, Release [v4.0-b10](https://github.com/ossrs/srs/releases/tag/v4.0-b10), v4.0-b10, 4.0 beta10, v4.0.251, 144665 lines. * 2022-02-15, Release [v4.0-b9](https://github.com/ossrs/srs/releases/tag/v4.0-b9), v4.0-b9, 4.0 beta9, v4.0.245, 144474 lines. diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index c810bfe29f..396350b84d 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -8,6 +8,7 @@ The changelog for SRS. ## SRS 4.0 Changelog +* v4.0, 2022-06-29, Update SRS image for r.ossrs.net. v4.0.253 * v4.0, 2022-06-11, For [#3058](https://github.com/ossrs/srs/pull/3058): Docker: Support x86_64, armv7 and aarch64 docker image (#3058). v4.0.252 * v4.0, 2022-03-19, For [#2893](https://github.com/ossrs/srs/pull/2893): SRT: Decouple publish with play url (#2893). v4.0.251 * v4.0, 2022-03-19, Merge [#2908](https://github.com/ossrs/srs/pull/2908): SRT: url supports multiple QueryStrings (#2908). v4.0.250 diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index ff51c69cc1..ba42c87458 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 252 +#define VERSION_REVISION 253 #endif