fixup! fixup! Added deb package

cartesi · Jun 6, 2023 · 323bbde · 323bbde
1 parent ccf3840
commit 323bbde
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -58,7 +58,7 @@ jobs:
         run: make deb DESTDIR=$PWD/_install/usr PREFIX=/usr DEB_FILENAME=machine-emulator.deb
 
       - name: Install [/opt/cartesi]
-        run: make install
+        run: make install install-tests
 
       - name: Fix install permissions [/opt/cartesi]
         run: find /opt/cartesi -type d -exec chmod 755 {} +
@@ -117,7 +117,7 @@ jobs:
           find /opt/cartesi/lib -type f -exec chmod 755 {} +
           find ./tests/ -type f -name "*.lua" -exec chmod 755 {} +
           chmod 755 ./tests/test-merkle-tree-hash ./tests/test-machine-c-api ./tests/test-grpc-server.sh ./tests/test-jsonrpc-server.sh
-          patchelf --set-rpath /opt/cartesi/lib ./tests/test-merkle-tree-hash
+          #patchelf --set-rpath /opt/cartesi/lib ./tests/test-merkle-tree-hash
           #patchelf --set-rpath /opt/cartesi/lib ./tests/test-machine-c-api
 
       - name: Download [rootfs.ext2]
@@ -423,7 +423,7 @@ jobs:
         run: make uarch-with-toolchain
 
       - name: Install [/opt/cartesi]
-        run: make install
+        run: make install install-tests
 
       - name: Fix install permissions [/opt/cartesi]
         run: find /opt/cartesi -type d -exec chmod 755 {} +
@@ -561,7 +561,7 @@ jobs:
         run: make uarch-with-toolchain
 
       - name: Install [/opt/cartesi]
-        run: make install
+        run: make install install-tests
 
       - name: Fix install permissions [/opt/cartesi]
         run: find /opt/cartesi -type d -exec chmod 755 {} +

diff --git a/Makefile b/Makefile
@@ -231,7 +231,6 @@ install-Linux:
 	cd $(BIN_INSTALL_PATH) && for x in $(DEP_TO_BIN) $(EMU_TO_BIN); do patchelf --set-rpath $(LIB_RUNTIME_PATH) $$x ; done
 	cd $(LIB_INSTALL_PATH) && for x in `find . -maxdepth 1 -type f -name "*.so*"`; do patchelf --set-rpath $(LIB_RUNTIME_PATH) $$x ; done
 	cd $(LUA_INSTALL_CPATH) && for x in `find . -maxdepth 2 -type f -name "*.so"`; do patchelf --set-rpath $(LIB_RUNTIME_PATH) $$x ; done
-	patchelf --set-rpath $(LIB_RUNTIME_PATH) src/tests/test-machine-c-api
 
 install-dep: $(BIN_INSTALL_PATH) $(LIB_INSTALL_PATH) $(LUA_INSTALL_PATH) $(LUA_INSTALL_CPATH)
 	cd $(BUILDDIR)/lib && $(INSTALL) $(DEP_TO_LIB) $(LIB_INSTALL_PATH)