From dd98599d3497a04d3d312b8d8c153c889896cc02 Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Thu, 21 Mar 2024 23:39:57 -0400 Subject: [PATCH 1/2] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 15733c65..236e57c1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,6 +43,7 @@ jobs: mkdir -p baseroms/gc-eu-mq-dbg/segments cp ~/baserom_original.z64 ./baseroms/gc-eu-mq-dbg/baserom.z64 cd tools + rm -rf ZAPD/ ln -s ../../ZAPD cd ../ make -j $(nproc) setup @@ -56,6 +57,7 @@ jobs: python3 -m pip install -r requirements.txt cp ~/baserom.mm.us.rev1.z64 ./baserom.mm.us.rev1.z64 cd tools + rm -rf ZAPD/ ln -s ../../ZAPD cd ../ make -C tools -j From 9e2c80b2adfd87a3991438a6be0d9d2aafaead00 Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Thu, 21 Mar 2024 23:43:07 -0400 Subject: [PATCH 2/2] Update main.yml --- .github/workflows/main.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 236e57c1..604c18c9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,15 +23,19 @@ jobs: - name: Checkout oot run: | cd ../ + rm -rf oot/ git clone https://github.com/zeldaret/oot.git cd oot + echo $(pwd) git submodule update --init --recursive - name: Checkout mm run: | cd ../ + rm -rf mm/ git clone https://github.com/zeldaret/mm.git cd mm + echo $(pwd) - name: Set up repos run: echo "Set up repos" @@ -40,6 +44,7 @@ jobs: run: | cd ../ cd oot + echo $(pwd) mkdir -p baseroms/gc-eu-mq-dbg/segments cp ~/baserom_original.z64 ./baseroms/gc-eu-mq-dbg/baserom.z64 cd tools @@ -52,6 +57,7 @@ jobs: run: | cd ../ cd mm + echo $(pwd) python3 -m venv .mm-env source .mm-env/bin/activate python3 -m pip install -r requirements.txt @@ -73,6 +79,7 @@ jobs: run: | cd ../ cd oot + echo $(pwd) make venv make -j @@ -80,6 +87,7 @@ jobs: run: | cd ../ cd mm + echo $(pwd) python3 -m venv .mm-env source .mm-env/bin/activate python3 -m pip install -r requirements.txt