From 2b5c1ad06d47bb149f16d68343bb4f2955b47fd9 Mon Sep 17 00:00:00 2001 From: john Date: Tue, 18 Mar 2025 08:27:08 +0800 Subject: [PATCH] update geekyeggo/delete-artifact to 5.0.0. v5.0.221 v6.0.163 v7.0.25 (#4302) > https://github.com/marketplace/actions/delete-artifact?version=v5.0.0#-compatibility The current version of `actions/upload-artifact` is `v4`, and the corresponding version for `delete-artifact` should be `v5`. --------- `TRANS_BY_GPT4` --------- Co-authored-by: chundonglinlin Co-authored-by: winlin --------- Co-authored-by: john --- .github/workflows/test.yml | 3 ++- trunk/doc/CHANGELOG.md | 2 ++ trunk/src/core/srs_core_version5.hpp | 2 +- trunk/src/core/srs_core_version6.hpp | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 645f0c32f..e645fde74 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -68,7 +68,8 @@ jobs: - uses: actions/download-artifact@v4 with: name: srs-cache - - uses: geekyeggo/delete-artifact@54ab544f12cdb7b71613a16a2b5a37a9ade990af # v2.0.0 + # https://github.com/marketplace/actions/delete-artifact?version=v5.0.0#-compatibility + - uses: geekyeggo/delete-artifact@v5.0.0 with: name: srs-cache ################################################################################################################## diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index d2290ecc8..d9324665f 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 6.0 Changelog +* v6.0, 2025-03-18, Merge [#4302](https://github.com/ossrs/srs/pull/4302): update geekyeggo/delete-artifact to 5.0.0. v6.0.163 (#4302) * v6.0, 2025-03-06, Merge [#4296](https://github.com/ossrs/srs/pull/4296): Dvr: support h265 flv fragments. v6.0.162 (#4296) * v6.0, 2025-02-20, Merge [#4253](https://github.com/ossrs/srs/pull/4253): fix typo about heartbeat. v6.0.161 (#4253) * v6.0, 2025-02-19, Merge [#4291](https://github.com/ossrs/srs/pull/4291): fix ci error. v6.0.160 (#4291) @@ -174,6 +175,7 @@ The changelog for SRS. ## SRS 5.0 Changelog +* v5.0, 2025-03-18, Merge [#4302](https://github.com/ossrs/srs/pull/4302): update geekyeggo/delete-artifact to 5.0.0. v5.0.221 (#4302) * v5.0, 2025-02-20, Merge [#4253](https://github.com/ossrs/srs/pull/4253): fix typo about heartbeat. v5.0.220 (#4253) * v5.0, 2025-02-19, Merge [#4291](https://github.com/ossrs/srs/pull/4291): fix ci error. v5.0.219 (#4291) * v5.0, 2025-01-14, Merge [#4271](https://github.com/ossrs/srs/pull/4271): update copyright to 2025. v5.0.218 (#4271) diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index 0f7e16b4f..87adb77fc 100644 --- a/trunk/src/core/srs_core_version5.hpp +++ b/trunk/src/core/srs_core_version5.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 0 -#define VERSION_REVISION 220 +#define VERSION_REVISION 221 #endif diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index d26aba03e..5b12e3814 100644 --- a/trunk/src/core/srs_core_version6.hpp +++ b/trunk/src/core/srs_core_version6.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 6 #define VERSION_MINOR 0 -#define VERSION_REVISION 162 +#define VERSION_REVISION 163 #endif