From 7edfaa0a66482665806db708e6fc7064cf9352e2 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 26 Apr 2025 00:13:00 -0400 Subject: [PATCH] Upgrade actions worlflow image to Ubuntu 22.04 --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/release.yml | 18 ++++++++--------- .github/workflows/test.yml | 28 +++++++++++++-------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 69796f15e..f68d8169c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -6,7 +6,7 @@ on: [push, pull_request] jobs: analyze: name: actions-codeql-analyze - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d318caa0d..9e478ad1f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,7 +43,7 @@ jobs: SRS_VERSION: ${{ env.SRS_VERSION }} SRS_MAJOR: ${{ env.SRS_MAJOR }} SRS_XYZ: ${{ env.SRS_XYZ }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 test: name: test @@ -73,7 +73,7 @@ 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' - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 draft: name: draft @@ -93,7 +93,7 @@ jobs: # 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 + runs-on: ubuntu-22.04 cygwin64: name: cygwin64 @@ -233,7 +233,7 @@ jobs: 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 + runs-on: ubuntu-22.04 docker-srs: name: docker-srs @@ -285,7 +285,7 @@ jobs: ossrs/srs:v${{ env.SRS_MAJOR }} ossrs/srs:${{ env.SRS_XYZ }} ossrs/srs:v${{ env.SRS_XYZ }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 aliyun-srs: name: aliyun-srs @@ -320,7 +320,7 @@ jobs: registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v${{ env.SRS_MAJOR }} registry.cn-hangzhou.aliyuncs.com/ossrs/srs:${{ env.SRS_XYZ }} registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v${{ env.SRS_XYZ }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 update: name: update @@ -357,7 +357,7 @@ jobs: command_timeout: 30m script: | echo "Update r.ossrs.net ok for SRS $SRS_MAJOR" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 release: name: release @@ -432,11 +432,11 @@ jobs: draft: false prerelease: false makeLatest: true - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 done: name: done - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: - update - release diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e2f6419ea..c0086db2e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,7 +42,7 @@ jobs: name: srs-cache path: objs.tar.bz2 retention-days: 1 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 cygwin64: name: cygwin64 @@ -101,7 +101,7 @@ jobs: run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target centos7-no-asm . - name: Build on CentOS7, C++98, no FFmpeg run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target centos7-ansi-no-ffmpeg . - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 build-ubuntu16: name: build-ubuntu16 @@ -115,7 +115,7 @@ jobs: run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-baseline . - name: Build on Ubuntu16, with all features run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-all . - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 build-ubuntu18: name: build-ubuntu18 @@ -129,7 +129,7 @@ jobs: run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu18-baseline . - name: Build on Ubuntu18, with all features run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu18-all . - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 build-ubuntu20: name: build-ubuntu20 @@ -143,7 +143,7 @@ jobs: run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-baseline . - name: Build on Ubuntu20, with all features run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-all . - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 build-cross-arm: name: build-cross-arm @@ -156,7 +156,7 @@ jobs: run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cache-cross-armv7 . - name: Cross Build for ARMv7 on Ubuntu20 run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cache-cross-armv7 . - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 build-cross-aarch64: name: build-cross-aarch64 @@ -169,7 +169,7 @@ jobs: run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cache-cross-aarch64 . - name: Cross Build for AARCH64 on Ubuntu20 run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cache-cross-aarch64 . - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 test: name: utest-regression-blackbox-test @@ -198,7 +198,7 @@ jobs: docker run --rm srs:test bash -c './objs/srs -c conf/regression-test.conf && \ cd 3rdparty/srs-bench && (./objs/srs_test -test.v || (cat ../../objs/srs.log && exit 1)) && \ ./objs/srs_gb28181_test -test.v' - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 coverage: name: coverage @@ -231,7 +231,7 @@ jobs: --env SRS_PR=$SRS_PR --env SRS_SHA=$SRS_SHA --env SRS_PROJECT=$SRS_PROJECT \ srs:cov bash -c './objs/srs_utest && bash auto/codecov.sh' # - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 multiple-arch-armv7: name: multiple-arch-armv7 @@ -252,7 +252,7 @@ jobs: --build-arg IMAGE=ossrs/srs:ubuntu20-cache \ --build-arg INSTALLDEPENDS="NO" \ -f Dockerfile . - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 multiple-arch-aarch64: name: multiple-arch-aarch64 @@ -273,7 +273,7 @@ jobs: --build-arg IMAGE=ossrs/srs:ubuntu20-cache \ --build-arg INSTALLDEPENDS="NO" \ -f Dockerfile . - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 multiple-arch-amd64: name: multiple-arch-amd64 @@ -295,7 +295,7 @@ jobs: --output "type=image,push=false" \ --build-arg IMAGE=ossrs/srs:ubuntu20-cache \ -f Dockerfile . - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 fast: name: fast @@ -303,7 +303,7 @@ jobs: - cygwin64-cache steps: - run: echo 'Start fast jobs' - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 done: name: done @@ -320,7 +320,7 @@ jobs: - multiple-arch-armv7 - multiple-arch-aarch64 - multiple-arch-amd64 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: echo 'All done'