Skip to content

Commit 4b64c5c

Browse files
winlinvipwinlinvip
committed
Upgrade actions worlflow image to Ubuntu 22.04
1 parent 2a7f009 commit 4b64c5c

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions: write-all
99
jobs:
1010
analyze:
1111
name: actions-codeql-analyze
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313

1414
strategy:
1515
fail-fast: false

‎.github/workflows/release.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
SRS_VERSION: ${{ env.SRS_VERSION }}
4848
SRS_MAJOR: ${{ env.SRS_MAJOR }}
4949
SRS_XYZ: ${{ env.SRS_XYZ }}
50-
runs-on: ubuntu-20.04
50+
runs-on: ubuntu-22.04
5151

5252
test:
5353
name: test
@@ -77,7 +77,7 @@ jobs:
7777
docker run --rm srs:test bash -c 'make && \
7878
./objs/srs -c conf/regression-test.conf && \
7979
cd 3rdparty/srs-bench && make && ./objs/srs_test -test.v'
80-
runs-on: ubuntu-20.04
80+
runs-on: ubuntu-22.04
8181

8282
draft:
8383
name: draft
@@ -97,7 +97,7 @@ jobs:
9797
# Map a step output to a job output, see https://docs.github.com/en/actions/using-jobs/defining-outputs-for-jobs
9898
outputs:
9999
SRS_RELEASE_ID: ${{ steps.create_draft.outputs.id }}
100-
runs-on: ubuntu-20.04
100+
runs-on: ubuntu-22.04
101101

102102
cygwin64:
103103
name: cygwin64
@@ -237,7 +237,7 @@ jobs:
237237
SRS_PACKAGE_MD5: ${{ env.SRS_PACKAGE_MD5 }}
238238
SRS_SOURCE_TAR: ${{ env.SRS_SOURCE_TAR }}
239239
SRS_SOURCE_MD5: ${{ env.SRS_SOURCE_MD5 }}
240-
runs-on: ubuntu-20.04
240+
runs-on: ubuntu-22.04
241241

242242
docker-srs:
243243
name: docker-srs
@@ -291,7 +291,7 @@ jobs:
291291
ossrs/srs:v${{ env.SRS_MAJOR }}
292292
ossrs/srs:${{ env.SRS_XYZ }}
293293
ossrs/srs:v${{ env.SRS_XYZ }}
294-
runs-on: ubuntu-20.04
294+
runs-on: ubuntu-22.04
295295

296296
aliyun-srs:
297297
name: aliyun-srs
@@ -326,7 +326,7 @@ jobs:
326326
registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v${{ env.SRS_MAJOR }}
327327
registry.cn-hangzhou.aliyuncs.com/ossrs/srs:${{ env.SRS_XYZ }}
328328
registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v${{ env.SRS_XYZ }}
329-
runs-on: ubuntu-20.04
329+
runs-on: ubuntu-22.04
330330

331331
update:
332332
name: update
@@ -391,7 +391,7 @@ jobs:
391391
docker rmi -f $image
392392
echo "Remove image $image, r0=$?"
393393
done
394-
runs-on: ubuntu-20.04
394+
runs-on: ubuntu-22.04
395395

396396
release:
397397
name: release
@@ -470,10 +470,10 @@ jobs:
470470
draft: false
471471
prerelease: true
472472
makeLatest: false
473-
runs-on: ubuntu-20.04
473+
runs-on: ubuntu-22.04
474474

475475
release-done:
476-
runs-on: ubuntu-20.04
476+
runs-on: ubuntu-22.04
477477
needs:
478478
- update
479479
- release

‎.github/workflows/test.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
name: srs-cache
4646
path: objs.tar.bz2
4747
retention-days: 1
48-
runs-on: ubuntu-20.04
48+
runs-on: ubuntu-22.04
4949

5050
cygwin64:
5151
name: cygwin64
@@ -104,7 +104,7 @@ jobs:
104104
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target centos7-no-asm .
105105
- name: Build on CentOS7, C++98, no FFmpeg
106106
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target centos7-ansi-no-ffmpeg .
107-
runs-on: ubuntu-20.04
107+
runs-on: ubuntu-22.04
108108

109109
build-ubuntu16:
110110
name: build-ubuntu16
@@ -118,7 +118,7 @@ jobs:
118118
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-baseline .
119119
- name: Build on Ubuntu16, with all features
120120
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-all .
121-
runs-on: ubuntu-20.04
121+
runs-on: ubuntu-22.04
122122

123123
build-ubuntu18:
124124
name: build-ubuntu18
@@ -132,7 +132,7 @@ jobs:
132132
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu18-baseline .
133133
- name: Build on Ubuntu18, with all features
134134
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu18-all .
135-
runs-on: ubuntu-20.04
135+
runs-on: ubuntu-22.04
136136

137137
build-ubuntu20:
138138
name: build-ubuntu20
@@ -146,7 +146,7 @@ jobs:
146146
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-baseline .
147147
- name: Build on Ubuntu20, with all features
148148
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-all .
149-
runs-on: ubuntu-20.04
149+
runs-on: ubuntu-22.04
150150

151151
build-cross-arm:
152152
name: build-cross-arm
@@ -159,7 +159,7 @@ jobs:
159159
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cache-cross-armv7 .
160160
- name: Cross Build for ARMv7 on Ubuntu20
161161
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cache-cross-armv7 .
162-
runs-on: ubuntu-20.04
162+
runs-on: ubuntu-22.04
163163

164164
build-cross-aarch64:
165165
name: build-cross-aarch64
@@ -172,7 +172,7 @@ jobs:
172172
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cache-cross-aarch64 .
173173
- name: Cross Build for AARCH64 on Ubuntu20
174174
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cache-cross-aarch64 .
175-
runs-on: ubuntu-20.04
175+
runs-on: ubuntu-22.04
176176

177177
test:
178178
name: utest-regression-blackbox-test
@@ -201,7 +201,7 @@ jobs:
201201
docker run --rm srs:test bash -c './objs/srs -c conf/regression-test.conf && \
202202
cd 3rdparty/srs-bench && (./objs/srs_test -test.v || (cat ../../objs/srs.log && exit 1)) && \
203203
./objs/srs_gb28181_test -test.v'
204-
runs-on: ubuntu-20.04
204+
runs-on: ubuntu-22.04
205205

206206
coverage:
207207
name: coverage
@@ -234,7 +234,7 @@ jobs:
234234
--env SRS_PR=$SRS_PR --env SRS_SHA=$SRS_SHA --env SRS_PROJECT=$SRS_PROJECT \
235235
srs:cov bash -c './objs/srs_utest && bash auto/codecov.sh'
236236
#
237-
runs-on: ubuntu-20.04
237+
runs-on: ubuntu-22.04
238238

239239
multiple-arch-armv7:
240240
name: multiple-arch-armv7
@@ -255,7 +255,7 @@ jobs:
255255
--build-arg IMAGE=ossrs/srs:ubuntu20-cache \
256256
--build-arg INSTALLDEPENDS="NO" \
257257
-f Dockerfile .
258-
runs-on: ubuntu-20.04
258+
runs-on: ubuntu-22.04
259259

260260
multiple-arch-aarch64:
261261
name: multiple-arch-aarch64
@@ -276,7 +276,7 @@ jobs:
276276
--build-arg IMAGE=ossrs/srs:ubuntu20-cache \
277277
--build-arg INSTALLDEPENDS="NO" \
278278
-f Dockerfile .
279-
runs-on: ubuntu-20.04
279+
runs-on: ubuntu-22.04
280280

281281
multiple-arch-amd64:
282282
name: multiple-arch-amd64
@@ -298,15 +298,15 @@ jobs:
298298
--output "type=image,push=false" \
299299
--build-arg IMAGE=ossrs/srs:ubuntu20-cache \
300300
-f Dockerfile .
301-
runs-on: ubuntu-20.04
301+
runs-on: ubuntu-22.04
302302

303303
fast:
304304
name: fast
305305
needs:
306306
- cygwin64-cache
307307
steps:
308308
- run: echo 'Start fast jobs'
309-
runs-on: ubuntu-20.04
309+
runs-on: ubuntu-22.04
310310

311311
test-done:
312312
needs:
@@ -322,7 +322,7 @@ jobs:
322322
- multiple-arch-armv7
323323
- multiple-arch-aarch64
324324
- multiple-arch-amd64
325-
runs-on: ubuntu-20.04
325+
runs-on: ubuntu-22.04
326326
steps:
327327
- run: echo 'All done'
328328

0 commit comments

Comments
 (0)