Skip to content

Commit

Permalink
Working on CI compile
Browse files Browse the repository at this point in the history
  • Loading branch information
EPICGameGuy committed Dec 30, 2023
1 parent 598a6ed commit 2702d45
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Compile ps2 engine
run: |
bash ./compile.sh
bash ./compile.sh ci
- uses: actions/upload-artifact@v3
with:
Expand Down
10 changes: 8 additions & 2 deletions compile.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 2702d45

Please sign in to comment.