Skip to content

Commit

Permalink
CI: Remove deprecated ubuntu-20.04 host and add windows-2025
Browse files Browse the repository at this point in the history
  • Loading branch information
ibc committed Mar 7, 2025
1 parent 74cd703 commit 37f368f
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 42 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/mediasoup-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: mediasoup-node

on:
push:
branches: [ v3 ]
branches: [v3]
pull_request:
workflow_dispatch:

Expand All @@ -17,15 +17,15 @@ jobs:
strategy:
matrix:
build:
- os: ubuntu-20.04
- os: ubuntu-22.04
node: 18
cc: gcc
cxx: g++
- os: ubuntu-22.04
- os: ubuntu-24.04
node: 20
cc: gcc
cxx: g++
- os: ubuntu-22.04
- os: ubuntu-24.04
node: 22
cc: gcc
cxx: g++
Expand Down Expand Up @@ -64,6 +64,10 @@ jobs:
node: 22
cc: cl
cxx: cl
- os: windows-2025
node: 22
cc: cl
cxx: cl
build-type:
- Release
- Debug
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mediasoup-rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: mediasoup-rust

on:
push:
branches: [ v3 ]
branches: [v3]
pull_request:
workflow_dispatch:

Expand All @@ -20,13 +20,13 @@ jobs:
strategy:
matrix:
build:
- os: ubuntu-20.04
- os: ubuntu-22.04
- os: ubuntu-24.04
- os: macos-13
- os: macos-14
- os: macos-15
- os: windows-2022
- os: windows-2025

runs-on: ${{ matrix.build.os }}

Expand Down
17 changes: 7 additions & 10 deletions .github/workflows/mediasoup-worker-prebuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,18 @@ name: mediasoup-worker-prebuild
# Only trigger on GitHub releases.
on:
release:
types: [ published ]
types: [published]

jobs:
ci:
strategy:
matrix:
build:
# Worker prebuild for Linux with kernel version 5 Ubuntu (20.04).
# Let's use an old version of Ubuntu (20.04) that builds the
# mediasoup-worker binary using an old version of GLib, so it will work
# Worker prebuild for Linux with kernel version 6 Ubuntu (22.04).
# Let's use Ubuntu 22.04 instead of 24.04 so that it builds the
# mediasoup-worker binary using an old version of GLib that will work
# on Linux hosts running more modern GLib versions.
# See https://github.com/versatica/mediasoup/issues/1089.
- os: ubuntu-20.04
cc: gcc
cxx: g++
# Worker prebuild for Linux with kernel version 6 Ubuntu (22.04).
# Let's not use Ubuntu 24.04 to avoid same potential problem as described
# above.
- os: ubuntu-22.04
cc: gcc
cxx: g++
Expand All @@ -36,6 +30,9 @@ jobs:
- os: windows-2022
cc: cl
cxx: cl
- os: windows-2025
cc: cl
cxx: cl
node:
- 22

Expand Down
27 changes: 1 addition & 26 deletions .github/workflows/mediasoup-worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: mediasoup-worker

on:
push:
branches: [ v3 ]
branches: [v3]
pull_request:
workflow_dispatch:

Expand All @@ -19,25 +19,6 @@ jobs:
fail-fast: false
matrix:
build:
- os: ubuntu-20.04
cc: gcc
cxx: g++
# Workaround for this issue in Ubunt 20.04:
# https://github.com/versatica/mediasoup/actions/runs/9992113733/job/27616379442?pr=1427
workaround-ubuntu-20-04: true
run-test-asan-address: true
# Skip test-asan-undefined in Linux with GCC due to a bug in GCC
# that affects abseil-cpp:
# https://github.com/abseil/abseil-cpp/issues/1634
run-test-asan-undefined: false
run-test-asan-thread: true
- os: ubuntu-20.04
cc: clang
cxx: clang++
workaround-ubuntu-20-04: true
run-test-asan-address: true
run-test-asan-undefined: true
run-test-asan-thread: true
- os: ubuntu-22.04
cc: gcc
cxx: g++
Expand Down Expand Up @@ -142,12 +123,6 @@ jobs:
name: npm ci --prefix worker/scripts
run: npm ci --prefix worker/scripts --foreground-scripts

# Workaround for this issue in Ubuntu 20.04:
# https://github.com/versatica/mediasoup/actions/runs/9992113733/job/27616379442?pr=1427
- if: ${{ matrix.build.workaround-ubuntu-20-04 }}
name: workaround for Ubuntu 20.04
run: sudo apt install -y libgcc-10-dev && sudo ln -s /usr/lib/gcc/x86_64-linux-gnu/10/libtsan_preinit.o /usr/lib/libtsan_preinit.o

# NOTE: Maybe make it work on Windows someday.
- if: runner.os != 'Windows'
name: invoke -r worker lint
Expand Down

0 comments on commit 37f368f

Please sign in to comment.