-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add frogress upload script and workflow
- Loading branch information
1 parent
854d023
commit 2626858
Showing
5 changed files
with
180 additions
and
65 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| name: CI | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| - frogress | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - name: Set up Python | ||
| uses: actions/setup-python@v2 | ||
| with: | ||
| python-version: "3.x" | ||
|
|
||
| - name: Install dependencies | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| pip install -U -r requirements.txt | ||
| - name: Setup wine | ||
| run: | | ||
| sudo dpkg --add-architecture i386 | ||
| sudo apt-get update | ||
| sudo apt-get install wine32 | ||
| - name: Setup build environment | ||
| run: | | ||
| sudo apt-get install binutils-mips-linux-gnu | ||
| scripts/setup_progd_linux.sh | ||
| curl -o disc/SCUS_971.98 "${{ secrets.FILE_URL }}" | ||
| - name: Run build script | ||
| run: | | ||
| python configure.py | ||
| ninja | ||
| - name: Post to frogress endpoint | ||
| run: | | ||
| python3 scripts/upload_progress.py --frogress_api_key ${{ secrets.FROGRESS_API_KEY }} --git_hash ${{ github.sha }} --timestamp ${{ github.event.head_commit.timestamp }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,3 +7,4 @@ pygfxd | |
| crunch64 | ||
| ninja | ||
| ninja_syntax | ||
| mapfile_parser | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| """ | ||
| Script for uploading progress to the frogress. | ||
| Adapted from https://github.com/zeldaret/af/blob/aeb01dcb95e8281f89f355604dbeba519ef073d5/tools/progress.py | ||
| MIT License: https://opensource.org/license/mit | ||
| """ | ||
| from pathlib import Path | ||
| import argparse | ||
| import mapfile_parser | ||
|
|
||
| ASMPATH = Path("asm") | ||
| NONMATCHINGS = "nonmatchings" | ||
| BASE_URL = "https://progress.deco.mp" | ||
| SLUG = "slycooper1" | ||
| VERSION = "us" | ||
|
|
||
| def getProgressFromMapFile(mapFile: mapfile_parser.MapFile, asmPath: Path, nonmatchings: Path, aliases: dict[str, str]=dict(), pathIndex: int=2) -> tuple[mapfile_parser.ProgressStats, dict[str, mapfile_parser.ProgressStats]]: | ||
| totalStats = mapfile_parser.ProgressStats() | ||
| progressPerFolder: dict[str, mapfile_parser.ProgressStats] = dict() | ||
|
|
||
| for segment in mapFile: | ||
| for file in segment: | ||
| if len(file) == 0: | ||
| continue | ||
|
|
||
| folder = file.filepath.parts[pathIndex] | ||
|
|
||
| if ".a" in folder: | ||
| folder = folder.split('.a')[0] | ||
|
|
||
| if folder in aliases: | ||
| folder = aliases[folder] | ||
|
|
||
| if folder not in progressPerFolder: | ||
| progressPerFolder[folder] = mapfile_parser.ProgressStats() | ||
|
|
||
| originalFilePath = Path(*file.filepath.parts[pathIndex:]) | ||
|
|
||
| extensionlessFilePath = originalFilePath | ||
| while extensionlessFilePath.suffix: | ||
| extensionlessFilePath = extensionlessFilePath.with_suffix("") | ||
|
|
||
| fullAsmFile = asmPath / extensionlessFilePath.with_suffix(".s") | ||
|
|
||
| handwrittenAsmFiles = [Path("sce/crt0.o")] | ||
|
|
||
| if originalFilePath in handwrittenAsmFiles: | ||
| wholeFileIsUndecomped = False | ||
| else: | ||
| wholeFileIsUndecomped = fullAsmFile.exists() | ||
|
|
||
| for func in file: | ||
| funcAsmPath = nonmatchings / extensionlessFilePath / f"{func.name}.s" | ||
|
|
||
| symSize = 0 | ||
| if func.size is not None: | ||
| symSize = func.size | ||
|
|
||
| if wholeFileIsUndecomped: | ||
| totalStats.undecompedSize += symSize | ||
| progressPerFolder[folder].undecompedSize += symSize | ||
| elif funcAsmPath.exists(): | ||
| totalStats.undecompedSize += symSize | ||
| progressPerFolder[folder].undecompedSize += symSize | ||
| else: | ||
| totalStats.decompedSize += symSize | ||
| progressPerFolder[folder].decompedSize += symSize | ||
|
|
||
| return totalStats, progressPerFolder | ||
|
|
||
| def getProgress(mapPath: Path) -> tuple[mapfile_parser.ProgressStats, dict[str, mapfile_parser.ProgressStats]]: | ||
| """ | ||
| Gets the progress of the using the mapfile parser. | ||
| """ | ||
| mapFile = mapfile_parser.MapFile() | ||
| mapFile.readMapFile(mapPath) | ||
|
|
||
| for segment in mapFile: | ||
| for file in segment: | ||
| if len(file) == 0: | ||
| continue | ||
|
|
||
| filepathParts = list(file.filepath.parts) | ||
| file.filepath = Path(*filepathParts) | ||
|
|
||
| nonMatchingsPath = ASMPATH / NONMATCHINGS | ||
|
|
||
| progress = getProgressFromMapFile(mapFile.filterBySectionType(".text"), ASMPATH, nonMatchingsPath, aliases={"ultralib": "libultra"}) | ||
|
|
||
| return progress | ||
|
|
||
| def main(args: argparse.ArgumentParser) -> None: | ||
| """ | ||
| Main function, calculates the progress and uploads it to the frogress. | ||
| """ | ||
| frogress_api_key = args.frogress_api_key | ||
| git_hash = args.git_hash | ||
| timestamp = args.timestamp | ||
|
|
||
| if not frogress_api_key: | ||
| raise ValueError("Missing frogress API key.") | ||
|
|
||
| if not git_hash: | ||
| raise ValueError("Missing git hash.") | ||
|
|
||
| if not timestamp: | ||
| raise ValueError("Missing timestamp.") | ||
| timestamp = int(timestamp) | ||
|
|
||
| mapPath = "out/SCUS_971.98.map" | ||
|
|
||
| codeTotalStats, codeProgressPerFolder = getProgress(mapPath) | ||
| codeEntries: dict[str, int] = mapfile_parser.frontends.upload_frogress.getFrogressEntriesFromStats(codeTotalStats, codeProgressPerFolder, verbose=True) | ||
|
|
||
| url = mapfile_parser.utils.generateFrogressEndpointUrl(BASE_URL, SLUG, VERSION) | ||
| mapfile_parser.frontends.upload_frogress.uploadEntriesToFrogress(codeEntries, "all", url, apikey=frogress_api_key, verbose=True) | ||
|
|
||
| if __name__ == "__main__": | ||
| parser = argparse.ArgumentParser(description="Upload progress to the frogress") | ||
| parser.add_argument("--frogress_api_key", help="API key for the frogress") | ||
| parser.add_argument("--git_hash", help="Git hash of the current commit") | ||
| parser.add_argument("--timestamp", help="Timestamp of the build") | ||
|
|
||
| args = parser.parse_args() | ||
| main(args) |