mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-10 19:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Changed progress.py csv output to be compatible with new website (#1075)

Browse source 
* Changed progress.py csv output to be compatible with new website

* Increment and clarify csv version

* Update csv paths
This commit is contained in:
EllipticEllipsis 2021-12-18 15:09:51 +00:00 committed by GitHub
parent 05b2cbfc60
commit 383a95d11e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Jenkinsfile vendored
View file

@ -39,9 +39,9 @@ pipeline {
} }
steps { steps {
sh 'mkdir reports' sh 'mkdir reports'
sh 'python3 progress.py csv >> reports/progress.csv' sh 'python3 progress.py csv >> reports/progress-oot-nonmatching.csv'
sh 'python3 progress.py csv -m >> reports/progress_matching.csv' sh 'python3 progress.py csv -m >> reports/progress-oot-matching.csv'
sh 'python3 progress.py shield-json > reports/progress_shield.json' sh 'python3 progress.py shield-json > reports/progress-oot-shield.json'
stash includes: 'reports/*', name: 'reports' stash includes: 'reports/*', name: 'reports'
} }
} }
@ -54,9 +54,9 @@ pipeline {
} }
steps { steps {
unstash 'reports' unstash 'reports'
sh 'cat reports/progress.csv >> /var/www/html/reports/progress.csv' sh 'cat reports/progress-oot-nonmatching.csv >> /var/www/zelda64.dev/assets/csv/progress-oot-nonmatching.csv'
sh 'cat reports/progress_matching.csv >> /var/www/html/reports/progress_matching.csv' sh 'cat reports/progress-oot-matching.csv >> /var/www/zelda64.dev/assets/csv/progress-matching.csv'
sh 'cat reports/progress_shield.json > /var/www/html/reports/progress_shield.json' sh 'cat reports/progress-oot-shield.json > /var/www/zelda64.dev/assets/csv/progress-oot-shield.json'
} }
} }
} }

4
README.md
View file

@ -5,8 +5,8 @@
[jenkins]: https://jenkins.deco.mp/job/OOT/job/master [jenkins]: https://jenkins.deco.mp/job/OOT/job/master
[jenkins-badge]: https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins.deco.mp%2Fjob%2FOOT%2Fjob%2Fmaster [jenkins-badge]: https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins.deco.mp%2Fjob%2FOOT%2Fjob%2Fmaster
[progress]: https://zelda64.dev/progress.html [progress]: https://zelda64.dev/games/oot
[progress-badge]: https://img.shields.io/endpoint?url=https://zelda64.dev/reports/progress_shield.json [progress-badge]: https://img.shields.io/endpoint?url=https://zelda64.dev/assets/csv/progress-oot-shield.json
[contributors]: https://github.com/zeldaret/oot/graphs/contributors [contributors]: https://github.com/zeldaret/oot/graphs/contributors
[contributors-badge]: https://img.shields.io/github/contributors/zeldaret/oot [contributors-badge]: https://img.shields.io/github/contributors/zeldaret/oot

4
progress.py
View file

@ -116,11 +116,11 @@ ovlPct = 100 * ovl / ovlSize
bytesPerHeartPiece = total // 80 bytesPerHeartPiece = total // 80
if args.format == 'csv': if args.format == 'csv':
version = 1 csv_version = 2
git_object = git.Repo().head.object git_object = git.Repo().head.object
timestamp = str(git_object.committed_date) timestamp = str(git_object.committed_date)
git_hash = git_object.hexsha git_hash = git_object.hexsha
csv_list = [str(version), timestamp, git_hash, str(code), str(codeSize), str(boot), str(bootSize), str(ovl), str(ovlSize), str(src), str(nonMatchingASM), str(len(nonMatchingFunctions))] csv_list = [str(csv_version), timestamp, git_hash, str(src), str(total), str(code), str(codeSize), str(boot), str(bootSize), str(ovl), str(ovlSize), str(nonMatchingASM), str(len(nonMatchingFunctions))]
print(",".join(csv_list)) print(",".join(csv_list))
elif args.format == 'shield-json': elif args.format == 'shield-json':
# https://shields.io/endpoint # https://shields.io/endpoint