diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f0335410..a2bffd11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,9 +7,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: devkitpro/devkitppc:latest - env: - WINEPREFIX: ${{github.workspace}}/.wine + container: ghcr.io/primedecomp/build:main strategy: fail-fast: false matrix: @@ -17,27 +15,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Checkout WiBo - uses: actions/checkout@v3 - with: - repository: decompals/WiBo - path: tools/WiBo - - name: Install dependencies - run: | - sudo dpkg --add-architecture i386 - sudo apt-get update - sudo apt-get -y install build-essential ninja-build python3 python3-requests gcc-multilib g++-multilib libc6:i386 - curl -L https://cdn.discordapp.com/attachments/727918646525165659/917185027656286218/GC_WII_COMPILERS.zip \ - | bsdtar -xvf- -C tools --exclude Wii - mv tools/GC/* tools/mwcc_compiler/ - - name: Build WiBo - working-directory: tools/WiBo - run: | - cmake -B build - cmake --build build - name: Build run: | - python3 configure.py --map --version ${{matrix.version}} --wine ./tools/WiBo/build/wibo + python configure.py --map --version ${{matrix.version}} --compilers /compilers/GC ninja - name: Upload progress if: github.ref == 'refs/heads/main' @@ -45,10 +25,10 @@ jobs: env: PROGRESS_API_KEY: ${{secrets.PROGRESS_API_KEY}} run: | - python3 tools/upload-progress.py -b https://progress.deco.mp/ -p prime -v ${{matrix.version}} \ + python tools/upload-progress.py -b https://progress.deco.mp/ -p prime -v ${{matrix.version}} \ build/mp1.${{matrix.version}}/main.dol.progress - name: Upload map - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: MetroidPrime-${{matrix.version}}.MAP path: build/*/MetroidPrime.MAP