Merge pull request #3291 from manyfold3d/remove-glfw

Remove glfw and required libs
manyfold3d · Dec 10, 2024 · 1ce65f8 · 1ce65f8
2 parents 25a0f8c + 9cd351b
commit 1ce65f8
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 30 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -4,9 +4,6 @@ description: Set up Manyfold build environment
 runs:
   using: composite
   steps:
-    - uses: awalsh128/cache-apt-pkgs-action@v1
-      with:
-        packages: libglfw3
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true

diff --git a/README.md b/README.md
@@ -46,7 +46,6 @@ To run the app yourself, you'll need the following installed:
 * Yarn >= 1.22
 * Foreman or [another Procfile runner](https://github.com/ddollar/foreman#ports)
 * [libarchive](https://github.com/chef/ffi-libarchive#installation) (for upload support)
-* [glfw3](https://github.com/danini-the-panini/mittsu#installation) (for model analysis & manipulation)
 
 To run the application once you've cloned this repo, you should be able to just run `bin/dev`; that should set up the database, perform migrations, install dependencies, and then make the application available at <http://127.0.0.1:5000>.
 

diff --git a/docker/build.dockerfile b/docker/build.dockerfile
@@ -8,9 +8,7 @@ RUN apk add --no-cache \
   npm \
   postgresql-dev \
   mariadb-dev \
-  libarchive \
-  mesa-gl \
-  glfw
+  libarchive
 
 COPY package.json .
 COPY yarn.lock .

diff --git a/docker/runtime.dockerfile b/docker/runtime.dockerfile
@@ -23,29 +23,6 @@ COPY --from=build \
   /usr/lib/liblz4.so.* \
   /usr/lib/libbz2.so.* \
   /usr/lib/libpq.so.* \
-  /usr/lib/libGL.so.* \
-  /usr/lib/libglapi.so.* \
-  /usr/lib/libdrm.so.* \
-  /usr/lib/libX11.so.* \
-  /usr/lib/libxcb-glx.so.* \
-  /usr/lib/libxcb.so.* \
-  /usr/lib/libX11-xcb.so.* \
-  /usr/lib/libxcb-dri2.so.* \
-  /usr/lib/libXext.so.* \
-  /usr/lib/libXfixes.so.* \
-  /usr/lib/libXxf86vm.so.* \
-  /usr/lib/libxcb-shm.so.* \
-  /usr/lib/libxshmfence.so.* \
-  /usr/lib/libxcb-dri3.so.* \
-  /usr/lib/libxcb-present.so.* \
-  /usr/lib/libxcb-sync.so.* \
-  /usr/lib/libxcb-xfixes.so.* \
-  /usr/lib/libxcb-randr.so.* \
-  /usr/lib/libXau.so.* \
-  /usr/lib/libXdmcp.so.* \
-  /usr/lib/libbsd.so.* \
-  /usr/lib/libmd.so.* \
-  /usr/lib/libglfw.so.* \
   /usr/lib
 
 # Set up jemalloc and YJIT for performance