lenn/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-11-23 19:34:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade actions worlflow image to Ubuntu 22.04

Browse Source 
See https://github.com/actions/runner-images/issues/11101 for details.
This commit is contained in:
winlin
2025-04-26 00:09:46 -04:00
parent 4e55bc83b7
commit 308bb6ec54
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/codeql-analysis.yml vendored
View File

@@ -9,7 +9,7 @@ permissions: write-all
jobs: jobs:
analyze: analyze:
name: actions-codeql-analyze name: actions-codeql-analyze
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false fail-fast: false

18
.github/workflows/release.yml vendored
View File

@@ -47,7 +47,7 @@ jobs:
SRS_VERSION: ${{ env.SRS_VERSION }} SRS_VERSION: ${{ env.SRS_VERSION }}
SRS_MAJOR: ${{ env.SRS_MAJOR }} SRS_MAJOR: ${{ env.SRS_MAJOR }}
SRS_XYZ: ${{ env.SRS_XYZ }} SRS_XYZ: ${{ env.SRS_XYZ }}
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
test: test:
name: test name: test
@@ -77,7 +77,7 @@ jobs:
docker run --rm srs:test bash -c 'make && \ docker run --rm srs:test bash -c 'make && \
./objs/srs -c conf/regression-test.conf && sleep 10 && \ ./objs/srs -c conf/regression-test.conf && sleep 10 && \
cd 3rdparty/srs-bench && make && ./objs/srs_test -test.v' cd 3rdparty/srs-bench && make && ./objs/srs_test -test.v'
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
draft: draft:
name: draft name: draft
@@ -97,7 +97,7 @@ jobs:
# Map a step output to a job output, see https://docs.github.com/en/actions/using-jobs/defining-outputs-for-jobs # Map a step output to a job output, see https://docs.github.com/en/actions/using-jobs/defining-outputs-for-jobs
outputs: outputs:
SRS_RELEASE_ID: ${{ steps.create_draft.outputs.id }} SRS_RELEASE_ID: ${{ steps.create_draft.outputs.id }}
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
cygwin64: cygwin64:
name: cygwin64 name: cygwin64
@@ -237,7 +237,7 @@ jobs:
SRS_PACKAGE_MD5: ${{ env.SRS_PACKAGE_MD5 }} SRS_PACKAGE_MD5: ${{ env.SRS_PACKAGE_MD5 }}
SRS_SOURCE_TAR: ${{ env.SRS_SOURCE_TAR }} SRS_SOURCE_TAR: ${{ env.SRS_SOURCE_TAR }}
SRS_SOURCE_MD5: ${{ env.SRS_SOURCE_MD5 }} SRS_SOURCE_MD5: ${{ env.SRS_SOURCE_MD5 }}
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
docker-srs: docker-srs:
name: docker-srs name: docker-srs
@@ -291,7 +291,7 @@ jobs:
ossrs/srs:v${{ env.SRS_MAJOR }} ossrs/srs:v${{ env.SRS_MAJOR }}
ossrs/srs:${{ env.SRS_XYZ }} ossrs/srs:${{ env.SRS_XYZ }}
ossrs/srs:v${{ env.SRS_XYZ }} ossrs/srs:v${{ env.SRS_XYZ }}
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
aliyun-srs: aliyun-srs:
name: aliyun-srs name: aliyun-srs
@@ -326,7 +326,7 @@ jobs:
registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v${{ env.SRS_MAJOR }} 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:${{ env.SRS_XYZ }}
registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v${{ 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: update:
name: update name: update
@@ -391,7 +391,7 @@ jobs:
docker rmi -f $image docker rmi -f $image
echo "Remove image $image, r0=$?" echo "Remove image $image, r0=$?"
done done
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
release: release:
name: release name: release
@@ -470,10 +470,10 @@ jobs:
draft: false draft: false
prerelease: true prerelease: true
makeLatest: false makeLatest: false
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
release-done: release-done:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
needs: needs:
- update - update
- release - release

28
.github/workflows/test.yml vendored
View File

@@ -45,7 +45,7 @@ jobs:
name: srs-cache name: srs-cache
path: objs.tar.bz2 path: objs.tar.bz2
retention-days: 1 retention-days: 1
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
cygwin64: cygwin64:
name: cygwin64 name: cygwin64
@@ -104,7 +104,7 @@ jobs:
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target centos7-no-asm . run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target centos7-no-asm .
- name: Build on CentOS7, C++98, no FFmpeg - name: Build on CentOS7, C++98, no FFmpeg
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target centos7-ansi-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: build-ubuntu16:
name: build-ubuntu16 name: build-ubuntu16
@@ -118,7 +118,7 @@ jobs:
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-baseline . run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-baseline .
- name: Build on Ubuntu16, with all features - name: Build on Ubuntu16, with all features
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-all . 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: build-ubuntu18:
name: build-ubuntu18 name: build-ubuntu18
@@ -132,7 +132,7 @@ jobs:
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu18-baseline . run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu18-baseline .
- name: Build on Ubuntu18, with all features - name: Build on Ubuntu18, with all features
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu18-all . 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: build-ubuntu20:
name: build-ubuntu20 name: build-ubuntu20
@@ -146,7 +146,7 @@ jobs:
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-baseline . run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-baseline .
- name: Build on Ubuntu20, with all features - name: Build on Ubuntu20, with all features
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-all . 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: build-cross-arm:
name: build-cross-arm name: build-cross-arm
@@ -159,7 +159,7 @@ jobs:
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cache-cross-armv7 . run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cache-cross-armv7 .
- name: Cross Build for ARMv7 on Ubuntu20 - name: Cross Build for ARMv7 on Ubuntu20
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cache-cross-armv7 . 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: build-cross-aarch64:
name: build-cross-aarch64 name: build-cross-aarch64
@@ -172,7 +172,7 @@ jobs:
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cache-cross-aarch64 . run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cache-cross-aarch64 .
- name: Cross Build for AARCH64 on Ubuntu20 - name: Cross Build for AARCH64 on Ubuntu20
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cache-cross-aarch64 . 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: test:
name: utest-regression-blackbox-test name: utest-regression-blackbox-test
@@ -201,7 +201,7 @@ jobs:
docker run --rm srs:test bash -c './objs/srs -c conf/regression-test.conf && sleep 10 && \ docker run --rm srs:test bash -c './objs/srs -c conf/regression-test.conf && sleep 10 && \
cd 3rdparty/srs-bench && (./objs/srs_test -test.v || (cat ../../objs/srs.log && exit 1)) && \ cd 3rdparty/srs-bench && (./objs/srs_test -test.v || (cat ../../objs/srs.log && exit 1)) && \
./objs/srs_gb28181_test -test.v' ./objs/srs_gb28181_test -test.v'
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
coverage: coverage:
name: coverage name: coverage
@@ -234,7 +234,7 @@ jobs:
--env SRS_PR=$SRS_PR --env SRS_SHA=$SRS_SHA --env SRS_PROJECT=$SRS_PROJECT \ --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' srs:cov bash -c './objs/srs_utest && bash auto/codecov.sh'
# #
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
multiple-arch-armv7: multiple-arch-armv7:
name: multiple-arch-armv7 name: multiple-arch-armv7
@@ -255,7 +255,7 @@ jobs:
--build-arg IMAGE=ossrs/srs:ubuntu20-cache \ --build-arg IMAGE=ossrs/srs:ubuntu20-cache \
--build-arg INSTALLDEPENDS="NO" \ --build-arg INSTALLDEPENDS="NO" \
-f Dockerfile . -f Dockerfile .
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
multiple-arch-aarch64: multiple-arch-aarch64:
name: multiple-arch-aarch64 name: multiple-arch-aarch64
@@ -276,7 +276,7 @@ jobs:
--build-arg IMAGE=ossrs/srs:ubuntu20-cache \ --build-arg IMAGE=ossrs/srs:ubuntu20-cache \
--build-arg INSTALLDEPENDS="NO" \ --build-arg INSTALLDEPENDS="NO" \
-f Dockerfile . -f Dockerfile .
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
multiple-arch-amd64: multiple-arch-amd64:
name: multiple-arch-amd64 name: multiple-arch-amd64
@@ -298,7 +298,7 @@ jobs:
--output "type=image,push=false" \ --output "type=image,push=false" \
--build-arg IMAGE=ossrs/srs:ubuntu20-cache \ --build-arg IMAGE=ossrs/srs:ubuntu20-cache \
-f Dockerfile . -f Dockerfile .
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
fast: fast:
name: fast name: fast
@@ -306,7 +306,7 @@ jobs:
- cygwin64-cache - cygwin64-cache
steps: steps:
- run: echo 'Start fast jobs' - run: echo 'Start fast jobs'
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
test-done: test-done:
needs: needs:
@@ -322,7 +322,7 @@ jobs:
- multiple-arch-armv7 - multiple-arch-armv7
- multiple-arch-aarch64 - multiple-arch-aarch64
- multiple-arch-amd64 - multiple-arch-amd64
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- run: echo 'All done' - run: echo 'All done'