@@ -687,9 +687,7 @@ jobs:
687687
688688 # Build FFmpeg with WebRTC support using mbedTLS
689689 PKG_CONFIG_PATH="$HOME/.release/mbedtls/lib/pkgconfig" \
690- ./configure --enable-muxer=whip --enable-mbedtls --enable-version3 \
691- --extra-cflags="-I$HOME/.release/mbedtls/include" \
692- --extra-ldflags="-L$HOME/.release/mbedtls/lib -lmbedtls -lmbedx509 -lmbedcrypto -Wl,-rpath,$HOME/.release/mbedtls/lib"
690+ ./configure --enable-muxer=whip --enable-mbedtls --enable-version3 --pkg-config="--static"\
693691 make -j$(nproc)
694692 ./ffmpeg -version && ./ffmpeg -muxers 2>/dev/null |grep whip
695693 - name : Start SRS Docker container
@@ -743,74 +741,6 @@ jobs:
743741 run : exit 1
744742 runs-on : ubuntu-22.04
745743
746- generate-patch :
747- name : " Generate Patch"
748- if : ${{ github.event_name == 'pull_request' }}
749- steps :
750- # Checkout to workflows branch, make sure the base branch is available.
751- - name : Checkout repository with workflows branch
752- uses : actions/checkout@v4
753- with :
754- ref : workflows
755- fetch-depth : 0
756- - name : Try to checkout to workflows branch
757- run : |
758- set -euxo pipefail
759- git checkout workflows
760- git branch -vv
761- # Checkout to PR commit, use the lastest script.
762- - name : Checkout repository to PR commit
763- uses : actions/checkout@v4
764- - name : Show Git Info
765- run : |
766- set -euxo pipefail
767- git branch -vv
768- echo "Repository: ${{ github.repository }}"
769- echo "Ref: ${{ github.ref }}"
770- echo "Event Name: ${{ github.event_name }}"
771- echo "Pull Request Number: ${{ github.event.pull_request.number }}"
772- - name : Install Dependencies
773- run : |
774- set -euxo pipefail
775- sudo apt-get update
776- sudo apt-get install -y jq
777- - name : Run Script
778- id : format_patch
779- run : |
780- set -euxo pipefail
781-
782- PR_NUMBER=${{ github.event.pull_request.number }}
783- PATCH_FILENAME="whip-patch-$PR_NUMBER-$(date +%s)"
784- TMP_BRANCH="tmp-branch-for-patch-$PR_NUMBER"
785- echo "PR ID is ${{ github.event.pull_request.number }}"
786- echo "Patch file is $PATCH_FILENAME.patch"
787- echo "Temporary branch is $TMP_BRANCH"
788-
789- bash .github/scripts/format-patch.sh $PR_NUMBER "$PATCH_FILENAME.patch"
790- echo "patch_file=$PATCH_FILENAME" >> $GITHUB_OUTPUT
791- echo "temporary_branch=$TMP_BRANCH" >> $GITHUB_OUTPUT
792-
793- if [[ -f "$PATCH_FILENAME.patch" ]]; then
794- echo "has_patch=true" >> $GITHUB_OUTPUT
795- else
796- echo "has_patch=false" >> $GITHUB_OUTPUT
797- fi
798- - name : Show Branch Info
799- if : ${{ steps.format_patch.outputs.has_patch == 'true' }}
800- run : git show ${{ steps.format_patch.outputs.temporary_branch }}
801- - name : Show Patch File
802- if : ${{ steps.format_patch.outputs.has_patch == 'true' }}
803- run : cat ${{ steps.format_patch.outputs.patch_file }}.patch
804- - name : Upload all patch files
805- if : ${{ steps.format_patch.outputs.has_patch == 'true' }}
806- uses : actions/upload-artifact@v4
807- with :
808- name : ${{ steps.format_patch.outputs.patch_file }}
809- path : |
810- whip-*.patch
811- retention-days : 90
812- runs-on : ubuntu-22.04
813-
814744 test-done :
815745 needs :
816746 - fate
@@ -823,7 +753,6 @@ jobs:
823753 - openssl-latest
824754 - gnutls
825755 - mbedtls
826- - generate-patch
827756 steps :
828757 - run : echo 'All done'
829758 runs-on : ubuntu-22.04
0 commit comments