Skip to content

Commit bb29cb1

Browse files
JackLau1222claude
andcommitted
workflows/test: replace OpenSSL 1.1.0h with OpenSSL 1.1.1w
FFmpeg dropped support for OpenSSL < 1.1.1, so remove the 1.1.0h job and add a 1.1.1w job using lavfi sources with libx264/libopus. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent c89ca46 commit bb29cb1

File tree

1 file changed

+15
-17
lines changed

1 file changed

+15
-17
lines changed

.github/workflows/test.yml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -359,23 +359,19 @@ jobs:
359359
run: exit 1
360360
runs-on: ubuntu-22.04
361361

362-
openssl-1-1-0h:
363-
name: "With OpenSSL 1.1.0h"
362+
openssl-1-1-1:
363+
name: "With OpenSSL 1.1.1"
364364
needs: build
365365
steps:
366366
- name: Checkout repository
367367
uses: actions/checkout@v4
368-
- name: Build OpenSSL 1.1.0h
368+
- name: Build OpenSSL 1.1.1
369369
run: |
370370
set -euxo pipefail
371-
curl -s -L https://www.openssl.org/source/openssl-1.1.0h.tar.gz | tar xz
372-
cd openssl-1.1.0h
371+
curl -s -L https://www.openssl.org/source/openssl-1.1.1w.tar.gz | tar xz
372+
cd openssl-1.1.1w
373373
./config --prefix=$HOME/.release/openssl
374374
make -j$(nproc) && sudo make install_sw
375-
- name: Download Test File
376-
run: |
377-
set -euxo pipefail
378-
curl -s -L -O https://github.com/ossrs/ffmpeg-webrtc/releases/download/pre-release/bbb-4mbps-baseline-opus.mp4
379375
- name: Build FFmpeg
380376
run: |
381377
set -euxo pipefail
@@ -389,7 +385,8 @@ jobs:
389385
./configure --enable-muxer=whip --enable-openssl \
390386
--extra-cflags="-I$HOME/.release/openssl/include" \
391387
--extra-ldflags="-L$HOME/.release/openssl/lib" \
392-
--pkg-config-flags="--static"
388+
--pkg-config-flags="--static" \
389+
--enable-libx264 --enable-gpl --enable-libopus
393390
make -j$(nproc)
394391
./ffmpeg -version && ./ffmpeg -muxers 2>/dev/null |grep whip
395392
- name: Start SRS Docker container
@@ -402,21 +399,22 @@ jobs:
402399
- name: Streaming with FFmpeg
403400
run: |
404401
set -euxo pipefail
405-
nohup ./ffmpeg -t 30 -re -i bbb-4mbps-baseline-opus.mp4 -c copy \
402+
nohup ./ffmpeg -t 30 -re -f lavfi -i testsrc=size=1280x720 -f lavfi -i sine=frequency=440 -pix_fmt yuv420p \
403+
-vcodec libx264 -profile:v baseline -r 25 -g 50 -acodec libopus -ar 48000 -ac 2 \
406404
-f whip "http://localhost:1985/rtc/v1/whip/?app=live&stream=livestream" \
407405
1>ffstdout.log 2>ffstderr.log &
408406
- name: Check SRS Streaming
409407
id: streaming
410408
run: |
411409
set -euxo pipefail
412-
410+
413411
# Check streams in SRS.
414412
for ((i=0; i<10; i++)); do
415413
STREAM=$(curl -s http://localhost:1985/api/v1/streams/ | jq -r '.streams[].name')
416-
if [[ "$STREAM" == "livestream" ]]; then
417-
echo 'Test OK';
414+
if [[ "$STREAM" == "livestream" ]]; then
415+
echo 'Test OK';
418416
echo "has_stream=true" >> $GITHUB_OUTPUT
419-
break;
417+
break;
420418
fi
421419
sleep 3
422420
done
@@ -427,7 +425,7 @@ jobs:
427425
fi
428426
- name: Stop FFmpeg normally
429427
run: |
430-
pkill -SIGINT ffmpeg && sleep 3 ||
428+
pkill -SIGINT ffmpeg && sleep 3 ||
431429
echo "FFmpeg process not found or already stopped."
432430
- name: Show FFmpeg Stdout Log
433431
run: cat ffstdout.log
@@ -682,7 +680,7 @@ jobs:
682680
- pion
683681
- janus
684682
- asan
685-
- openssl-1-1-0h
683+
- openssl-1-1-1
686684
- openssl-3-0
687685
- openssl-latest
688686
- generate-patch

0 commit comments

Comments
 (0)