From 563e047f529717956c7abf85dfdcae6564e51966 Mon Sep 17 00:00:00 2001
From: Maksym Sobolyev <sobomax@sippysoft.com>
Date: Sat, 5 Oct 2024 12:21:46 -0700
Subject: [PATCH] + 5a5b58ba37

---
 .github/workflows/rtp.io.yml | 11 ++++++-----
 scripts/build/do_build.sh    | 10 ++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/rtp.io.yml b/.github/workflows/rtp.io.yml
index 3ba5c9207f4..6025d8539af 100644
--- a/.github/workflows/rtp.io.yml
+++ b/.github/workflows/rtp.io.yml
@@ -13,7 +13,8 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  build:
+  build_test_rtp_io:
+    name: Build & Test rtp.io module
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     container:
@@ -22,6 +23,7 @@ jobs:
     env:
       COMPILER: clang-18
       BUILD_OS: ubuntu-latest
+      PYTHON_VERSION: 3.12
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -51,7 +53,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'sippy/voiptests'
-          ref: wip
           path: dist/voiptests
 
       - name: Checkout RTPProxy repo
@@ -60,14 +61,14 @@ jobs:
           repository: 'sippy/rtpproxy'
           path: dist/rtpproxy
 
-      - name: Set up Python 3.12
+      - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@v5
         with:
-          python-version: 3.12
+          python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Define PYTHON_CMD
         run: |
-          PYTHON_VER="`echo 3.12 | sed 's|-dev$||'`"
+          PYTHON_VER="`echo ${{ env.PYTHON_VERSION }} | sed 's|-dev$||'`"
           echo "PYTHON_CMD=python${PYTHON_VER}" >> $GITHUB_ENV
 
       - name: Test rtp.io module
diff --git a/scripts/build/do_build.sh b/scripts/build/do_build.sh
index 3fb6594dbe7..13b0a4bd839 100755
--- a/scripts/build/do_build.sh
+++ b/scripts/build/do_build.sh
@@ -14,12 +14,14 @@ then
   EXCLUDE_MODULES="${EXCLUDE_MODULES} ${EXCLUDE_MODULES_ADD}"
 fi
 
-MAKE_ENV="CC_EXTRA_OPTS=${CC_EXTRA_OPTS:-"-Werror"} FASTER=1 NICER=0"
-MAKE_CMD="env ${MAKE_ENV} make"
+MAKE_ENV="FASTER=1 NICER=0"
+MAKE_CMD="${MAKE_ENV} make"
 
 if [ ! -z "${ONE_MODULE}" ]
 then
-  ${MAKE_CMD} -C "modules/${ONE_MODULE}"
+  CC_EXTRA_OPTS="${CC_EXTRA_OPTS:-"-Werror"}" ${MAKE_CMD} \
+   -C "modules/${ONE_MODULE}"
 else
-  ${MAKE_CMD} exclude_modules="${EXCLUDE_MODULES}" "${@}" ${MAKE_TGT:-"all"}
+  CC_EXTRA_OPTS="${CC_EXTRA_OPTS:-"-Werror"}" ${MAKE_CMD} \
+   exclude_modules="${EXCLUDE_MODULES}" "${@}" ${MAKE_TGT:-"all"}
 fi