chore: try macos

Author: edayot

.github/workflows/artifact.yml

@@ -80,49 +80,39 @@ jobs:
           name: dist-windows
           path: dist-windows.zip
 
-  # macos-tests:
-  #   runs-on: macos-latest
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v2
-  #       with:
-  #         fetch-depth: 0
-  #     - name: Setup Python 3.14
-  #       uses: actions/setup-python@v2
-  #       with:
-  #         python-version: 3.14
-  #     - name: Install uv
-  #       uses: astral-sh/setup-uv@v7
-  #       with:
-  #         enable-cache: true
-  #     - name: Sync Python dependencies
-  #       run: uv sync --dev
-  #     - name: Setup OpenGL (macOS)
-  #       run: |
-  #         # macOS comes with OpenGL support built-in.
-  #         # Optionally install freeglut if your project requires it.
-  #         brew update
-
-  #         brew install freeglut
-  #         brew install --cask xquartz
-  #         export DYLD_LIBRARY_PATH="$(brew --prefix freeglut)/lib:$DYLD_LIBRARY_PATH"
-  #         sleep 2
-  #         export DISPLAY=:0
-  #         export LIBGL_ALWAYS_SOFTWARE=1
-  #         export SDL_VIDEODRIVER=dummy
-
-  #         cd examples/all_white
-
-  #         uv run beet
-
-  #         cd ../..
-
-
-
-  #     - name: Upload dist folder
-  #       run: tar -czvf dist-macos.tar.gz dist/
-  #     - name: Upload compressed dist folder
-  #       uses: actions/upload-artifact@v4
-  #       with:
-  #         name: dist-macos
-  #         path: dist-macos.tar.gz
+  macos-tests:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '25'
+      - name: Setup Python 3.14
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.14
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+      - name: Sync Python dependencies
+        run: uv sync --dev
+      - name: Setup OpenGL and Run Tests
+        uses: edayot/model_resolver@master
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GIT_HASH: ${{ github.sha }}
+        with:
+          commands: |
+            uv run beet
+      - name: Upload dist folder
+        run: tar -czvf dist-macos.tar.gz dist/
+      - name: Upload compressed dist folder
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist-macos
+          path: dist-macos.tar.gz

action.yml

@@ -42,17 +42,18 @@ runs:
     - name: Setup OpenGL (macOS)
       if: runner.os == 'macOS'
       run: |
-        # macOS comes with OpenGL support built-in.
-        # Optionally install freeglut if your project requires it.
         brew update
         brew install freeglut || echo "freeglut already installed"
-        brew install --cask xquartz
-        export DYLD_LIBRARY_PATH="$(brew --prefix freeglut)/lib:$DYLD_LIBRARY_PATH"
-        open -a XQuartz
-        sleep 2
-        export DISPLAY=:0
-        export LIBGL_ALWAYS_SOFTWARE=1
-
+        brew install --cask xquartz || echo "xquartz already installed"
+        # Persist environment variables to subsequent steps via $GITHUB_ENV
+        echo "DYLD_LIBRARY_PATH=$(brew --prefix freeglut)/lib:${DYLD_LIBRARY_PATH:-}" >> $GITHUB_ENV
+        echo "DISPLAY=:0" >> $GITHUB_ENV
+        echo "LIBGL_ALWAYS_SOFTWARE=1" >> $GITHUB_ENV
+        # Add XQuartz binaries to PATH for subsequent steps
+        echo "/opt/X11/bin" >> $GITHUB_PATH
+        # Start XQuartz X server
+        /opt/X11/bin/Xquartz :0 -screen 0 2560x1440x24 &
+        sleep 5
       shell: bash
 
     - name: Execute Commands (Linux)
@@ -77,6 +78,8 @@ runs:
     - name: Execute Commands (macOS)
       if: runner.os == 'macOS'
       run: |
-        # OpenGL is natively supported on macOS; no virtual framebuffer needed.
-        ${{ inputs.commands }}
+        echo "set -e" > /tmp/commands.sh
+        echo "${{ inputs.commands }}" >> /tmp/commands.sh
+        chmod +x /tmp/commands.sh
+        bash /tmp/commands.sh
       shell: bash