Skip to content

replace action runner from ubuntu-20.04 -> ubuntu-22.04 #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/api-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
##################################################################################################################
# Git checkout
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
# The github.ref is, for example, refs/tags/v5.0.145 or refs/tags/v5.0-r8
# Generate variables like:
# SRS_TAG=nodejs-v1.0.52
Expand All @@ -28,7 +28,7 @@ jobs:
outputs:
SRS_TAG: ${{ env.SRS_TAG }}
SRS_MAJOR: ${{ env.SRS_MAJOR }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

docker:
needs:
Expand All @@ -40,7 +40,7 @@ jobs:
echo "SRS_MAJOR=${{ needs.envs.outputs.SRS_MAJOR }}" >> $GITHUB_ENV
# Git checkout
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
# Build SRS image
- name: Build SRS docker image
run: |
Expand All @@ -56,7 +56,7 @@ jobs:
run: |
docker tag ossrs/oryx:$SRS_TAG ossrs/oryx:$SRS_MAJOR
docker push --all-tags ossrs/oryx
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

aliyun:
needs:
Expand All @@ -81,7 +81,7 @@ jobs:
dst: |
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:${{ env.SRS_TAG }}
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:${{ env.SRS_MAJOR }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

deploy:
needs:
Expand All @@ -94,7 +94,7 @@ jobs:
echo "SRS_MAJOR=${{ needs.envs.outputs.SRS_MAJOR }}" >> $GITHUB_ENV
# Git checkout
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
# Generate variables like:
# SRS_DROPLET_EIP=1.2.3.4
- name: Build droplet variables
Expand Down Expand Up @@ -137,4 +137,4 @@ jobs:
docker rmi -f $image
echo "Remove image $image, r0=$?"
done
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/focal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
##################################################################################################################
# Git checkout
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
# The github.ref is, for example, refs/tags/v5.0.145 or refs/tags/v5.0-r8
# Generate variables like:
# SRS_TAG=nodejs-v1.0.52
Expand All @@ -28,7 +28,7 @@ jobs:
outputs:
SRS_TAG: ${{ env.SRS_TAG }}
SRS_MAJOR: ${{ env.SRS_MAJOR }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

docker:
needs:
Expand All @@ -40,7 +40,7 @@ jobs:
echo "SRS_MAJOR=${{ needs.envs.outputs.SRS_MAJOR }}" >> $GITHUB_ENV
# Git checkout
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
# See https://github.com/crazy-max/ghaction-docker-buildx#moved-to-docker-organization
# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
Expand All @@ -66,7 +66,7 @@ jobs:
src: ossrs/oryx:${{ env.SRS_TAG }}
dst: |
ossrs/oryx:${{ env.SRS_MAJOR }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

aliyun:
needs:
Expand All @@ -91,4 +91,4 @@ jobs:
dst: |
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:${{ env.SRS_TAG }}
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:${{ env.SRS_MAJOR }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
18 changes: 9 additions & 9 deletions .github/workflows/mirrors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
dst: |
ossrs/ubuntu:focal
ossrs/ubuntu
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

# See https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/node/images
aliyun-node:
Expand All @@ -97,7 +97,7 @@ jobs:
registry.cn-hangzhou.aliyuncs.com/ossrs/node:slim
registry.cn-hangzhou.aliyuncs.com/ossrs/node:hydrogen-slim
registry.cn-hangzhou.aliyuncs.com/ossrs/node:18
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

# See https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/prometheus/images
aliyun-prom:
Expand All @@ -116,7 +116,7 @@ jobs:
dst: |
registry.cn-hangzhou.aliyuncs.com/ossrs/prometheus:v2.40.7
registry.cn-hangzhou.aliyuncs.com/ossrs/prometheus
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

# See https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/pushgateway/images
aliyun-pushgateway:
Expand All @@ -135,7 +135,7 @@ jobs:
dst: |
registry.cn-hangzhou.aliyuncs.com/ossrs/pushgateway:v1.4.3
registry.cn-hangzhou.aliyuncs.com/ossrs/pushgateway
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

# See https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/redis_exporter/images
aliyun-redis-exporter:
Expand All @@ -153,7 +153,7 @@ jobs:
src: oliver006/redis_exporter
dst: |
registry.cn-hangzhou.aliyuncs.com/ossrs/redis_exporter
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

# See https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/node-exporter/images
aliyun-node-exporter:
Expand All @@ -172,7 +172,7 @@ jobs:
dst: |
registry.cn-hangzhou.aliyuncs.com/ossrs/node-exporter
registry.cn-hangzhou.aliyuncs.com/ossrs/node-exporter:v1.4.1
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

# See https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/redis/images
# TODO: FIXME: Only amd64.
Expand All @@ -192,7 +192,7 @@ jobs:
dst: |
registry.cn-hangzhou.aliyuncs.com/ossrs/redis:5.0
registry.cn-hangzhou.aliyuncs.com/ossrs/redis
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

# See https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/grafana/images
aliyun-grafana:
Expand All @@ -211,7 +211,7 @@ jobs:
dst: |
registry.cn-hangzhou.aliyuncs.com/ossrs/grafana:9.3.1
registry.cn-hangzhou.aliyuncs.com/ossrs/grafana
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

# See https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/ubuntu/images
aliyun-ubuntu:
Expand All @@ -230,5 +230,5 @@ jobs:
dst: |
registry.cn-hangzhou.aliyuncs.com/ossrs/ubuntu:focal
registry.cn-hangzhou.aliyuncs.com/ossrs/ubuntu
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

8 changes: 4 additions & 4 deletions .github/workflows/nginx-hls-cdn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
SRS_VERSION: ${{ env.SRS_VERSION }}
SRS_MAJOR_HTTP: ${{ env.SRS_MAJOR_HTTP }}
SRS_MAJOR_HTTPS: ${{ env.SRS_MAJOR_HTTPS }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

docker:
needs:
Expand All @@ -31,7 +31,7 @@ jobs:
echo "SRS_MAJOR_HTTP=${{ needs.envs.outputs.SRS_MAJOR_HTTP }}" >> $GITHUB_ENV
echo "SRS_MAJOR_HTTPS=${{ needs.envs.outputs.SRS_MAJOR_HTTPS }}" >> $GITHUB_ENV
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
src: ossrs/oryx:${{ env.SRS_MAJOR_HTTPS }}
dst: |
ossrs/oryx:${{ env.SRS_MAJOR_HTTPS }}-${{ env.SRS_VERSION }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

aliyun:
needs:
Expand Down Expand Up @@ -105,4 +105,4 @@ jobs:
dst: |
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:${{ env.SRS_MAJOR_HTTPS }}
registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:${{ env.SRS_MAJOR_HTTPS }}-${{ env.SRS_VERSION }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
40 changes: 20 additions & 20 deletions .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
##################################################################################################################
# Git checkout
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
# The github.ref is, for example, refs/tags/v5.0.145 or refs/tags/v5.0-r8
# Generate variables like:
# SRS_TAG=v1.0.52
Expand All @@ -31,16 +31,16 @@ jobs:
outputs:
SRS_TAG: ${{ env.SRS_TAG }}
SRS_MAJOR: ${{ env.SRS_MAJOR }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

run-test:
name: Run UTest
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs:
- envs
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Download test file
run: |
curl --location --output test/source.200kbps.768x320.flv \
Expand All @@ -67,18 +67,18 @@ jobs:

build-platform-image:
name: Build platform image
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs:
- envs
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build image for platform
run: |
docker build -t platform:latest -f Dockerfile .
docker images
docker save -o platform.tar platform:latest
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: platform-cache
path: platform.tar
Expand All @@ -91,7 +91,7 @@ jobs:
- build-platform-image
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Download test file
run: |
curl --location --output test/source.200kbps.768x320.flv \
Expand All @@ -101,7 +101,7 @@ jobs:
docker run --rm -v /usr/bin:/g ossrs/srs:tools \
cp /usr/local/bin/ffmpeg /usr/local/bin/ffprobe /g/
ffmpeg -version
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: platform-cache
- name: Run test for platform image
Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
echo "Log of docker.log" && cat docker.log

exit $ret
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

test-en-image:
name: Test EN image
Expand All @@ -163,7 +163,7 @@ jobs:
- build-platform-image
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Download test file
run: |
curl --location --output test/source.200kbps.768x320.flv \
Expand All @@ -173,7 +173,7 @@ jobs:
docker run --rm -v /usr/bin:/g ossrs/srs:tools \
cp /usr/local/bin/ffmpeg /usr/local/bin/ffprobe /g/
ffmpeg -version
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: platform-cache
- name: Run test for platform image
Expand Down Expand Up @@ -226,11 +226,11 @@ jobs:
echo "Log of docker.log" && cat docker.log

exit $ret
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

test-zh-installer:
name: Test ZH installer
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs:
- envs
- build-platform-image
Expand All @@ -240,7 +240,7 @@ jobs:
echo "SRS_TAG=${{ needs.envs.outputs.SRS_TAG }}" >> $GITHUB_ENV
echo "SRS_MAJOR=${{ needs.envs.outputs.SRS_MAJOR }}" >> $GITHUB_ENV
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Download test file
run: |
curl --location --output test/source.200kbps.768x320.flv \
Expand All @@ -254,7 +254,7 @@ jobs:
run: |
sudo systemctl start nginx
sudo systemctl status nginx
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: platform-cache
- name: Load platform image
Expand Down Expand Up @@ -319,7 +319,7 @@ jobs:

test-en-installer:
name: Test EN installer
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs:
- envs
- build-platform-image
Expand All @@ -329,7 +329,7 @@ jobs:
echo "SRS_TAG=${{ needs.envs.outputs.SRS_TAG }}" >> $GITHUB_ENV
echo "SRS_MAJOR=${{ needs.envs.outputs.SRS_MAJOR }}" >> $GITHUB_ENV
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Download test file
run: |
curl --location --output test/source.200kbps.768x320.flv \
Expand All @@ -343,7 +343,7 @@ jobs:
run: |
sudo systemctl start nginx
sudo systemctl status nginx
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: platform-cache
- name: Load platform image
Expand Down Expand Up @@ -408,7 +408,7 @@ jobs:

test-pr-final:
name: test-pr-final
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs:
- run-test
- test-zh-image
Expand Down
Loading
Loading