ci: fix macos build error

Simple-XX · Sep 12, 2024 · c381c81 · c381c81
1 parent 4126130
commit c381c81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -124,14 +124,10 @@ jobs:
           echo "DISPLAY=:99" >> $GITHUB_ENV
           export DISPLAY=:99
           sleep 3  # Give Xvfb some time to start
-          if ! pgrep Xvfb; then
-            echo "Xvfb did not start correctly"
-            exit 1
-          fi
-          if [ -z "$DISPLAY" ]; then
-            echo "DISPLAY environment variable is not set"
-            exit 1
-          fi
+      
+      - name: check OpenGL
+        run: |
+          glxinfo | grep "OpenGL version"
 
       - name: Build
         run: |

diff --git a/test/system_test/MassSpring3D/main.cpp b/test/system_test/MassSpring3D/main.cpp
@@ -158,7 +158,10 @@ static void initGlutState(int argc, char** argv, const char* window_title = "",
     glutInit(&argc, argv);
     glutInitWindowSize(window_width, window_height);
     glutInitWindowPosition(0, 0);
-    glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH);  /// TODO
+    glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH);
+#ifdef __APPLE__
+    glutInitContextFlags(GLUT_FORWARD_COMPATIBLE | GLUT_DEBUG);
+#endif
     glutCreateWindow(window_title);
     glutDisplayFunc(&display);
     glutReshapeFunc(&reshape);