Add progress badges & use upload-progress.py (#149)

* Add progress badges; use upload-progress

* ci: use projectpiki/build
This commit is contained in:
Luke Street 2023-01-31 17:35:10 -05:00 committed by GitHub
parent 6878f8c5aa
commit ae4123eeb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 15 deletions

View File

@ -8,7 +8,7 @@ jobs:
build:
name: Build
runs-on: ubuntu-latest
container: ghcr.io/primedecomp/build:main
container: ghcr.io/projectpiki/build:main
strategy:
fail-fast: false
matrix:
@ -23,12 +23,12 @@ jobs:
python configure.py --map --version ${{matrix.version}} --compilers /compilers/GC
ninja
- name: Upload progress
if: false # github.ref == 'refs/heads/main'
if: github.ref == 'refs/heads/main'
continue-on-error: true
env:
PROGRESS_API_KEY: ${{secrets.PROGRESS_API_KEY}}
run: |
python 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 pikmin2 -v ${{matrix.version}} \
build/pikmin2.${{matrix.version}}/main.dol.progress
- name: Upload map
uses: actions/upload-artifact@v3
@ -39,7 +39,7 @@ jobs:
build_make:
name: Build (legacy)
runs-on: ubuntu-latest
container: ghcr.io/primedecomp/build:main
container: ghcr.io/projectpiki/build:main
strategy:
fail-fast: false
matrix:
@ -49,7 +49,5 @@ jobs:
uses: actions/checkout@v3
- name: Git config
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Install dependencies
run: apk add --no-cache make gcc musl-dev
- name: Build
run: make -j$(nproc) MAPGENFLAG=1 VERSION=${{matrix.version}} COMPILERS=/compilers/GC

View File

@ -1,15 +1,23 @@
# Pikmin 2
Pikmin 2 decompilation to C++/C
Pikmin 2 [![Build Status]][actions] ![Code Progress] ![Data Progress]
========
```diff
- INFORMATION! -
[Build Status]: https://github.com/projectPiki/pikmin2/actions/workflows/build.yml/badge.svg
[actions]: https://github.com/projectPiki/pikmin2/actions/workflows/build.yml
[Code Progress]: https://img.shields.io/endpoint?label=Code&url=https%3A%2F%2Fprogress.deco.mp%2Fdata%2Fpikmin2%2Fusa%2Fdol%2F%3Fmode%3Dshield%26measure%3Dcode
[Data Progress]: https://img.shields.io/endpoint?label=Data&url=https%3A%2F%2Fprogress.deco.mp%2Fdata%2Fpikmin2%2Fusa%2Fdol%2F%3Fmode%3Dshield%26measure%3Ddata
The ROM this repository builds can be shifted. You are able to add
and remove code as you see fit, for modding or research purposes.
A decompilation of Pikmin 2.
This repository builds the following DOLs:
```
90d328bf8f190c90472e8c19e7e53c6ad0fe0d1a build/pikmin2.usa/main.dol
3730939092688902af4866be66d4a8404ae752c7 build/pikmin2.usa.demo/main.dol
```
It builds the following DOL:
pikmin2.usa.dol: `sha1: 90d328bf8f190c90472e8c19e7e53c6ad0fe0d1a`
> **Note**
> The ROM this repository builds can be shifted. You are able to add
> and remove code as you see fit, for modding or research purposes.
## Building

View File

@ -19,7 +19,7 @@ def get_git_commit_sha() -> str:
def generate_url(args: argparse.Namespace) -> str:
url_components = [args.base_url.rstrip('/'), 'data']
for arg in [args.project, args.version]:
for arg in [args.project, args.version.replace('.', '-')]:
if arg != "":
url_components.append(arg)