PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to use ninja for actions again

This commit is contained in:
Phillip Stephens 2022-10-07 01:39:43 -07:00
parent 8de39f488c
commit b3aa0057e4
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
run: | run: |
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
sudo apt-get update sudo apt-get update
sudo apt-get -y install build-essential gcc-multilib g++-multilib libc6:i386 sudo apt-get -y install build-essential ninja-build python3 gcc-multilib g++-multilib libc6:i386
curl -L https://cdn.discordapp.com/attachments/727918646525165659/917185027656286218/GC_WII_COMPILERS.zip \ curl -L https://cdn.discordapp.com/attachments/727918646525165659/917185027656286218/GC_WII_COMPILERS.zip \
| bsdtar -xvf- -C tools --exclude Wii | bsdtar -xvf- -C tools --exclude Wii
mv tools/GC/* tools/mwcc_compiler/ mv tools/GC/* tools/mwcc_compiler/
@ -36,7 +36,9 @@ jobs:
cmake -B build cmake -B build
cmake --build build cmake --build build
- name: Build - name: Build
run: make -j$(nproc) WINE=./tools/WiBo/build/wibo GENERATE_MAP=1 VERSION=${{matrix.version}} run: |
python3 configure.py --map --version ${{matrix.version}} --wine ./tools/WiBo/build/wibo
ninja
- name: Upload map - name: Upload map
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:

12
configure.py
View File

@ -10,12 +10,12 @@ from tools import ninja_syntax
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('--version', dest='version', parser.add_argument('--version', dest='version',
default='0', help='version to build (0, 1, kor)') default='0', help='version to build (0, 1, kor)')
parser.add_argument('--map', dest='map', action=argparse.BooleanOptionalAction, parser.add_argument('--map', dest='map', action='store_true',
default=False, help='generate map file') help='generate map file')
parser.add_argument('--check', dest='check', action=argparse.BooleanOptionalAction, parser.add_argument('--no-check', dest='check', action='store_false',
default=True, help='check hash of resulting dol') help='don\'t check hash of resulting dol')
parser.add_argument('--static-libs', dest='static_libs', action=argparse.BooleanOptionalAction, parser.add_argument('--static-libs', dest='static_libs', action='store_true',
default=False, help='build and use static libs') help='build and use static libs')
parser.add_argument('--devkitppc', dest='devkitppc', help='path to devkitPPC') parser.add_argument('--devkitppc', dest='devkitppc', help='path to devkitPPC')
if os.name != "nt" and not "_NT-" in os.uname().sysname: if os.name != "nt" and not "_NT-" in os.uname().sysname:
parser.add_argument('--wine', dest='wine', help='path to wine (or wibo)') parser.add_argument('--wine', dest='wine', help='path to wine (or wibo)')