1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-24 21:56:03 +00:00
Commit graph

26 commits

Author SHA1 Message Date
Dragorn421
64dd475a3a
[Faster CI] Make CI not run CC_CHECK (#1686)
* Make CI not run CC_CHECK

* I put it on the wrong step bruh

* Introduce RUN_CC_CHECK instead (like MM)
2024-02-01 15:08:45 -05:00
Dragorn421
d65fb6ed28
Check format: only check modified files, v2 (#1680)
* Check format: only check modified files, v2

* cheeky z_play edit

* format

* rename z_play.c -> z_play_.c

* Revert "rename z_play.c -> z_play_.c"

This reverts commit 9da9e76309.

* rm z_moji.c

* Revert "rm z_moji.c"

This reverts commit bd2d5acb5a.
2024-01-31 18:05:33 -05:00
Dragorn421
44408ce219
Only check formatting on modified files (#1673)
* only check formatting on modified files (attempt 1)

* foreshadow maximum command string length being an issue and pass files list using a file

* rm temp file list otherwise it shows in git status and counts as a "formatting diff"...

* cheeky z_play modif

* format
2024-01-30 22:25:24 -05:00
cadmic
6e0d67f9ec
Check formatting in CI (#1652)
* Check formatting in CI

* Move deleteDir() to cleanup section

* Revert "Move deleteDir() to cleanup section"

This reverts commit 4b0dd80cac.

* Give up on check_format.txt

* Fix formatting
2024-01-29 07:25:58 -05:00
cadmic
5dd19e4862
Use virtualenv in Makefile for python dependencies (#1619)
* Use virtualenv in Makefile for python dependencies

* Create separate targets for venv creation and installation

* Fix install-python-deps prerequisite

* Try simplifying Jenkinsfile

* Simplify venv targets

* Fix merge

* Update README.md

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-01-25 01:39:13 +01:00
Anghelo Carvajal
3d9db8d34d
Setup rom decompression and compression (#1614)
* decompress baserom

* cleanup

* specific hash check

* rename baserom

* git subrepo clone (merge) --branch=5da3132606e4fd427a8d72b8428e4f921cd6e56f git@github.com:z64tools/z64compress.git tools/z64compress

subrepo:
  subdir:   "tools/z64compress"
  merged:   "5da313260"
upstream:
  origin:   "git@github.com:z64tools/z64compress.git"
  branch:   "5da3132606e4fd427a8d72b8428e4f921cd6e56f"
  commit:   "5da313260"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* setup compression

* Add all compressed segments to the spec

* Update md5 files

* readme instructions

* cleanup

* Setup python dependencies on Jenkinsfile

* Update Makefile

Co-authored-by: cadmic <cadmic24@gmail.com>

* review

* . .venv/bin/activate

* update readme

* whoops

* Yeet other versions from decompress_baserom.py

* my bad

* Move everything to baseroms/VERSION/

* Active venv on each command

* jenkinsfile: use multiline syntax

* Put the correct path on the jenkinsfile

* Forgot to call per_version_fixes

* CC0

* Update readme

* Change where baserom segments are put into

* Update Makefile

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update crunch64

* Label compressed instead of uncompressed

* Update README.md

Co-authored-by: fig02 <fig02srl@gmail.com>

* Fix

* `make rom`

* baserom-uncompressed

* Update README.md

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update README.md

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update README.md

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update README.md

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update README.md

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* review

* baserom-decompressed.z64

* ignore baseroms

* rm -rf tools/z64compress

* wip crunch64-based compress.py

* OK compress

* use ipl3checksum sum directly for cic update on compressed rom

* multithreading

* "docs"

* fix MT: move set_sigint_ignored to global level for pickling

* license compress.py

* rm junk

* Fix (or at least sort out) compress_ranges.txt dependencies

* Update tools/overlayhelpers/damage_table.py

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-24 13:00:10 -05:00
cadmic
25ff0a27de
Create separate build directories based on version (#1591)
* Create separate build directories based on version

* Fix find_unused_asm.sh

* Remove find_unused_asm.sh from Jenkinsfile

* Revert diff.py

* Clarify that gc-eu-mq is not "supported" yet

* Revert xmlcreate.py (to be deleted)

* Remove gc-eu-mq for now

* Add version flags to diff_settings.py and sym_info.py

* --version -> --oot-version

* Fix --oot-version

* Revert adding version flags to tools

* Delete find_unused_asm.sh

* Revert changes to first_diff.py output in tutorial

* Factor out sed usages for spec
2024-01-05 23:27:19 +01:00
Derek Hensley
dc010abf7a
Rename master to main (#1536)
* Jenkinsfile master -> main

* Missed some instances of master
2023-09-22 11:40:19 -04:00
Parker Burnett
7100b17e5f
Jenkinsfile update (#1474)
* Updating Jenkinsfile for a more thorough cleanup

* adding steps to the clean stage

* jk, maybe we don't want to do an initial clean...

* how about now?

* okay, surely now
2022-12-20 14:13:52 +09:00
Ethan Roseman
7996df1913
Update Jenkinsfile 2022-10-16 16:45:29 +09:00
Ethan Roseman
6213fe3bbd
Fix Jenkinsfile 2021-12-19 00:31:22 +09:00
EllipticEllipsis
383a95d11e
Changed progress.py csv output to be compatible with new website (#1075)
* Changed progress.py csv output to be compatible with new website

* Increment and clarify csv version

* Update csv paths
2021-12-19 00:09:51 +09:00
Ethan Roseman
9b9a983860
Jenkins refactor (#732)
* Jenkins refactor

* reorder
2021-03-22 21:17:02 -04:00
Roman971
f95a5aec68
Various README updates (#671)
* Update README

* Add shields.io badges in the README

* Add a mention about shiftability in README

* Fix shield json command in JenkinsFile

* Improve progress badge formatting

Now it should show the percentage as 51.2% instead of 51.17%, and 100% instead of 100.00%
2021-02-11 07:10:05 -05:00
Ethan Roseman
6f54edd365
Ido Static Recomp (#337)
* Ido Recomp test

* try 2

* Recomp by default

* Fix Jenkinsfile

* Fix 2

* CFE errors

* CFE fix -O2

* Update Makefile

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update README.md

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update README.md

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* PR suggestions

* PR updates

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-22 19:06:52 -04:00
Ethan Roseman
054f6dc04d
Fail the Jenkins build if there's any unused asm (#222)
* Check for unused asm

* Deleting some unused asm
2020-06-23 13:59:59 -04:00
Ethan Roseman
22d79e5e95
CSV Progress (2) (#219)
* CSV Progress (2)

* Git time
2020-06-21 20:58:56 -04:00
Ethan Roseman
afce6a3c36
Output progress to csv file (#218) 2020-06-21 17:50:32 -04:00
Ethan Roseman
ba0e57eecd
Progress reporting through Jenkins (2) (#166)
* Progress reporting through Jenkins

* Update progress.py

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Jenkins reporting attempt 2

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-05-26 17:00:22 -04:00
Ethan Roseman
e3dc47efe7
Progress reporting through Jenkins (#164)
* Progress reporting through Jenkins

* Update progress.py

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-05-26 16:36:30 -04:00
Ethan Roseman
f9bdb1d58a
Docker Support for OSX (#91)
* Makefile machinery work

* Updating Jenkinsfile

* Initial setup for OSX repo support

* Adding ido7 to repo

* Makefile reversion

* Iniital Dockerfile

* Docker stuff

* fixbaserom cleanup

* Attempting to fix fixbaserom

* baserom_original -> input

* Revert "baserom_original -> input"

This reverts commit d9199462b6.

* Spiffing up readme for OSX
2020-04-24 20:34:00 -04:00
fig02
147bbe0a41 remove zap2 step from jenkinsfile 2020-04-05 17:55:49 -04:00
Ethan Roseman
fd9b31e103 setup too 2020-04-05 12:18:58 -04:00
Ethan Roseman
1469f828ac Testing faster jenkins build 2020-04-05 12:12:25 -04:00
Jack Walker
ec37636a7a Updated jenkins file, readme, and replaced 'extract' target with 'setup' 2020-03-28 17:34:57 -04:00
Ethan Roseman
08a7e448a2 Jenkins test 2020-03-17 01:54:42 -04:00