From 2702d45c6c6570dc2dd7f135611af9ca50ba9f16 Mon Sep 17 00:00:00 2001 From: EPICGameGuy Date: Sat, 30 Dec 2023 01:45:23 -0500 Subject: [PATCH] Working on CI compile --- .github/workflows/docker-image.yml | 2 +- compile.sh | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 08ddbc6..0b95f4c 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -27,7 +27,7 @@ jobs: - name: Compile ps2 engine run: | - bash ./compile.sh + bash ./compile.sh ci - uses: actions/upload-artifact@v3 with: diff --git a/compile.sh b/compile.sh index 075aa89..647dc8b 100755 --- a/compile.sh +++ b/compile.sh @@ -1,6 +1,8 @@ #!/bin/bash -# sudo apt install build-essential binutils-dev git cmake genisoimage libassimp-dev +if [ $1 != "ci" ]; then + sudo apt install -y build-essential binutils-dev git cmake genisoimage libassimp-dev +fi # Meshoptimizer if [ ! -d "dependencies/meshoptimizer" ]; then @@ -44,7 +46,11 @@ echo "------Compiling Masp------" pushd dependencies/openvcl/contrib/masp if [ ! -f "Makefile" ]; then chmod +x ./configure - ./configure LIBS="-lobstack" + if [ $1 = "ci" ]; then + ./configure LIBS="-lobstack" + else + ./configure + fi fi sudo -E make install -j$(nproc) popd