done

versatica · Jul 18, 2024 · a2f355e · a2f355e
1 parent e1ac150
commit a2f355e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 31 deletions.
diff --git a/.github/workflows/mediasoup-worker-fuzzer.yaml b/.github/workflows/mediasoup-worker-fuzzer.yaml
@@ -34,14 +34,14 @@ jobs:
         uses: actions/checkout@v4
 
       # We need to install pip invoke manually.
-      - name: pip3 install invoke
+      - if: runner.os != 'macOS'
+        name: pip3 install invoke
         run: pip3 install invoke
-        if: runner.os != 'macOS'
 
       # In macOS we need to specify this option.
-      - name: pip3 install --break-system-packages invoke
+      - if: runner.os == 'macOS'
+        name: pip3 install --break-system-packages invoke
         run: pip3 install --break-system-packages invoke
-        if: runner.os == 'macOS'
 
       # Build the mediasoup-worker-fuzzer binary (which uses libFuzzer).
       - name: invoke -r worker fuzzer

diff --git a/.github/workflows/mediasoup-worker.yaml b/.github/workflows/mediasoup-worker.yaml
@@ -18,13 +18,13 @@ jobs:
           - os: ubuntu-20.04
             cc: gcc
             cxx: g++
-            # Workaround for this issue:
+            # Workaround for this issue in Ubunt 20.04:
             # https://github.com/versatica/mediasoup/actions/runs/9992113733/job/27616379442?pr=1427
-            install-libgcc-9-dev: true
+            workaround-ubuntu-20-04: true
           - os: ubuntu-20.04
             cc: clang
             cxx: clang++
-            install-libgcc-9-dev: true
+            workaround-ubuntu-20-04: true
           - os: ubuntu-22.04
             cc: gcc
             cxx: g++
@@ -89,50 +89,39 @@ jobs:
         name: npm ci --prefix worker/scripts
         run: npm ci --prefix worker/scripts --foreground-scripts
 
-      # Workaround for this issue:
+      # Workaround for this issue in Ubuntu 20.04:
       # https://github.com/versatica/mediasoup/actions/runs/9992113733/job/27616379442?pr=1427
-      - if: ${{ matrix.build.install-libgcc-9-dev }}
+      - 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
         run: invoke -r worker lint
 
       - name: invoke -r worker mediasoup-worker
         run: invoke -r worker mediasoup-worker
 
-      - name: invoke -r worker test
+      # NOTE: Maybe make it work on Windows someday.
+      - if: runner.os != 'Windows'
+        name: invoke -r worker test
         run: invoke -r worker test
 
-      # Let's clean everything before rebuilding worker tests with ASAN.
-      - if: runner.os == 'Linux'
-        name: invoke -r worker clean-all
-        run: invoke -r worker clean-all
-
       # Address Sanitizer only works on Linux.
-      - if: runner.os == 'Linux'
-        name: invoke -r worker test-asan-address
-        run: invoke -r worker test-asan-address
-
       # Let's clean everything before rebuilding worker tests with ASAN.
       - if: runner.os == 'Linux'
-        name: invoke -r worker clean-all
-        run: invoke -r worker clean-all
-
-      # TODO: Uncomment once https://github.com/versatica/mediasoup/issues/1417
-      # is fixed.
-      - name: invoke -r worker test-asan-undefined
-        run: invoke -r worker test-asan-undefined
-        # Address Sanitizer only works on Linux.
-        if: runner.os == 'Linux'
+        name: invoke -r worker test-asan-address
+        run: invoke -r worker clean-all && invoke -r worker test-asan-address
 
+      # Address Sanitizer only works on Linux.
       # Let's clean everything before rebuilding worker tests with ASAN.
       - if: runner.os == 'Linux'
-        name: invoke -r worker clean-all
-        run: invoke -r worker clean-all
+        name: invoke -r worker test-asan-undefined
+        run: invoke -r worker clean-all && invoke -r worker test-asan-undefined
 
       # Address Sanitizer only works on Linux.
+      # Let's clean everything before rebuilding worker tests with ASAN.
       - if: runner.os == 'Linux'
         name: invoke -r worker test-asan-thread
-        run: invoke -r worker test-asan-thread
+        run: invoke -r worker clean-all && invoke -r worker test-asan-thread