Merge branch 'main' into feat/add_macos_ci

.github/workflows/fast_tests.yml

@@ -57,7 +57,11 @@ jobs:
   # It runs everytime we commit to a PR or push to main
   fast-pytest-tests:
     name: Fast Pytest Tests
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     env:
       MUJOCO_GL: egl
     steps:
@@ -67,12 +71,21 @@ jobs:
           lfs: true
 
       # TODO(Steven): Evaluate the need of these dependencies
-      - name: Install apt dependencies
+      - name: Install dependencies
         run: |
-          sudo apt-get update && sudo apt-get install -y build-essential git \
+          if [[ "${{ matrix.os }}" == 'ubuntu-latest' ]]; then
-          curl libglib2.0-0 libegl1-mesa-dev ffmpeg \
+            sudo apt-get update && sudo apt-get install -y build-essential \
-          libusb-1.0-0-dev speech-dispatcher libgeos-dev portaudio19-dev
+            git curl libglib2.0-0 libegl1-mesa-dev ffmpeg libusb-1.0-0-dev \
-
+            speech-dispatcher libgeos-dev portaudio19-dev
+          elif [[ "${{ matrix.os }}" == 'macos-latest' ]]; then
+            brew update && brew install git geos portaudio ffmpeg@7
+            # Add ffmpeg@7 paths for subsequent steps
+            echo "PATH=/opt/homebrew/opt/ffmpeg@7/bin:$PATH" >> $GITHUB_ENV
+            echo "LDFLAGS=-L/opt/homebrew/opt/ffmpeg@7/lib" >> $GITHUB_ENV
+            echo "CPPFLAGS=-I/opt/homebrew/opt/ffmpeg@7/include" >> $GITHUB_ENV
+            echo "PKG_CONFIG_PATH=/opt/homebrew/opt/ffmpeg@7/lib/pkgconfig" >> $GITHUB_ENV
+            echo "DYLD_LIBRARY_PATH=/opt/homebrew/opt/ffmpeg@7/lib:/opt/homebrew/lib:/usr/local/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
+          fi
       - name: Setup uv and Python
         uses: astral-sh/setup-uv@v6 # zizmor: ignore[unpinned-uses]
         with:

.github/workflows/full_tests.yml

@@ -51,7 +51,11 @@ jobs:
   # It runs everytime a PR is approved or a push to main
   full-tests:
     name: Full Tests
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     if: |
       (github.event_name == 'pull_request_review' && github.event.review.state == 'approved') ||
       github.event_name == 'push' ||
@@ -64,11 +68,16 @@ jobs:
           lfs: true
           persist-credentials: false
 
-      - name: Install apt dependencies
+      - name: Install dependencies
         run: |
-          sudo apt-get update && sudo apt-get install -y build-essential \
+          if [[ "${{ matrix.os }}" == 'ubuntu-latest' ]]; then
-          git curl libglib2.0-0 libegl1-mesa-dev ffmpeg libusb-1.0-0-dev \
+            sudo apt-get update && sudo apt-get install -y build-essential \
-          speech-dispatcher libgeos-dev portaudio19-dev
+            git curl libglib2.0-0 libegl1-mesa-dev ffmpeg libusb-1.0-0-dev \
+            speech-dispatcher libgeos-dev portaudio19-dev
+          elif [[ "${{ matrix.os }}" == 'macos-latest' ]]; then
+            brew update && brew install git geos portaudio ffmpeg@7
+            echo "DYLD_LIBRARY_PATH=/opt/homebrew/opt/ffmpeg@7/lib:/opt/homebrew/lib:/usr/local/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
+          fi
 
       - name: Setup uv and Python
         uses: astral-sh/setup-uv@v6 # zizmor: ignore[unpinned-uses]

.github/workflows/release.yml

@@ -120,7 +120,11 @@ jobs:
   test-release:
     name: Test Release
     needs: [build-and-publish]
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     permissions:
       contents: read
     env:
@@ -130,11 +134,16 @@ jobs:
         with:
           lfs: true
           persist-credentials: false
-      - name: Install apt dependencies
+      - name: Install dependencies
         run: |
-          sudo apt-get update && sudo apt-get install -y build-essential \
+          if [[ "${{ matrix.os }}" == 'ubuntu-latest' ]]; then
-          git curl libglib2.0-0 libegl1-mesa-dev ffmpeg libusb-1.0-0-dev \
+            sudo apt-get update && sudo apt-get install -y build-essential \
-          speech-dispatcher libgeos-dev portaudio19-dev
+            git curl libglib2.0-0 libegl1-mesa-dev ffmpeg libusb-1.0-0-dev \
+            speech-dispatcher libgeos-dev portaudio19-dev
+          elif [[ "${{ matrix.os }}" == 'macos-latest' ]]; then
+            brew update && brew install git geos portaudio ffmpeg@7
+            echo "DYLD_LIBRARY_PATH=/opt/homebrew/opt/ffmpeg@7/lib:/opt/homebrew/lib:/usr/local/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
+          fi
       - name: Setup uv and Python
         uses: astral-sh/setup-uv@v6 # zizmor: ignore[unpinned-uses]
         with:

.github/workflows/unbound_deps_tests.yml

@@ -42,7 +42,11 @@ jobs:
   # This job runs the E2E tests + pytest with all unbound extras
   full-tests:
     name: Full Unbound Tests
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     env:
       MUJOCO_GL: egl
     steps:
@@ -51,11 +55,16 @@ jobs:
           lfs: true
           persist-credentials: false
 
-      - name: Install apt dependencies
+      - name: Install dependencies
         run: |
-          sudo apt-get update && sudo apt-get install -y build-essential \
+          if [[ "${{ matrix.os }}" == 'ubuntu-latest' ]]; then
-          git curl libglib2.0-0 libegl1-mesa-dev ffmpeg libusb-1.0-0-dev \
+            sudo apt-get update && sudo apt-get install -y build-essential \
-          speech-dispatcher libgeos-dev portaudio19-dev
+            git curl libglib2.0-0 libegl1-mesa-dev ffmpeg libusb-1.0-0-dev \
+            speech-dispatcher libgeos-dev portaudio19-dev
+          elif [[ "${{ matrix.os }}" == 'macos-latest' ]]; then
+            brew update && brew install git geos portaudio ffmpeg@7
+            echo "DYLD_LIBRARY_PATH=/opt/homebrew/opt/ffmpeg@7/lib:/opt/homebrew/lib:/usr/local/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
+          fi
 
       - name: Setup uv and Python
         uses: astral-sh/setup-uv@v6 # zizmor: ignore[unpinned-uses]