From c95212e38c3df6b2ccde7b9d2ffbcd0ac299481d Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 16 Aug 2024 02:00:27 -0400 Subject: [PATCH 01/14] Update build.yml --- .github/workflows/build.yml | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 01cdc66..f0d7151 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,16 +19,38 @@ jobs: name: Build with Docker using devkitARM steps: - name: Checkout repo - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Setup environment run: git config --global safe.directory '*' + - name: Set up Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: "3.12" - name: Build TAD Delivery Tool run: make - name: Publish build to GH Actions - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.6 with: - path: "*.dsi" - name: build + path: "TDT.dsi" + name: TDT-Nightly-Unsigned + - name: Clone ntool + uses: GuillaumeFalourd/clone-github-repo-action@v2.1 + with: + depth: 1 + branch: 'master' + owner: 'xprism1' + repository: 'ntool' + - name: Devsign TAD Delivery Tool + run: | + cp TDT.dsi ntool/ + cd ntool/ + python ntool.py srl_retail2dev TDT.dsi + - name: Publish devsigned build to GH Actions + uses: actions/upload-artifact@v4.3.6 + with: + path: "ntool/TDT_dev.dsi" + name: TDT-Nightly-Devsigned + # Only run this for non-PR jobs. publish_build: @@ -42,8 +64,7 @@ jobs: with: name: build path: build - - name: - if: + - name: Publish Build run: | ID=$(jq --raw-output '.release.id' $GITHUB_EVENT_PATH) From 0fa509e5fd0510a35eaa9ae0acf3aed4cbe608d5 Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 16 Aug 2024 02:09:11 -0400 Subject: [PATCH 02/14] Update build.yml --- .github/workflows/build.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f0d7151..cc7407a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,10 +22,6 @@ jobs: uses: actions/checkout@v4 - name: Setup environment run: git config --global safe.directory '*' - - name: Set up Python 3.12 - uses: actions/setup-python@v5 - with: - python-version: "3.12" - name: Build TAD Delivery Tool run: make - name: Publish build to GH Actions @@ -33,6 +29,19 @@ jobs: with: path: "TDT.dsi" name: TDT-Nightly-Unsigned + + devsign: + runs-on: windows-latest + name: Devsign TDT and build a TAD + steps: + - name: Download artifact + uses: actions/download-artifact@v4 + with: + name: TDT-Nightly-Unsigned + - name: Set up Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: "3.12" - name: Clone ntool uses: GuillaumeFalourd/clone-github-repo-action@v2.1 with: @@ -42,6 +51,7 @@ jobs: repository: 'ntool' - name: Devsign TAD Delivery Tool run: | + 7z e TDT-Nightly-Unsigned.zip cp TDT.dsi ntool/ cd ntool/ python ntool.py srl_retail2dev TDT.dsi From 492cdddc043f4ac2f3cac9afc752149fcc6cb4be Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 16 Aug 2024 02:12:16 -0400 Subject: [PATCH 03/14] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc7407a..97837f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,6 +32,7 @@ jobs: devsign: runs-on: windows-latest + needs: [build] name: Devsign TDT and build a TAD steps: - name: Download artifact From f802636230b585f2f7a162754f02f50b40dc084a Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 16 Aug 2024 02:15:05 -0400 Subject: [PATCH 04/14] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 97837f8..0efe494 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,7 +47,6 @@ jobs: uses: GuillaumeFalourd/clone-github-repo-action@v2.1 with: depth: 1 - branch: 'master' owner: 'xprism1' repository: 'ntool' - name: Devsign TAD Delivery Tool @@ -55,6 +54,7 @@ jobs: 7z e TDT-Nightly-Unsigned.zip cp TDT.dsi ntool/ cd ntool/ + pip install pycryptodome python ntool.py srl_retail2dev TDT.dsi - name: Publish devsigned build to GH Actions uses: actions/upload-artifact@v4.3.6 From 58a662b23e38c0132634946a40c97853d364807c Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 16 Aug 2024 02:17:51 -0400 Subject: [PATCH 05/14] Update build.yml --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0efe494..90b72f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,6 +39,7 @@ jobs: uses: actions/download-artifact@v4 with: name: TDT-Nightly-Unsigned + path: D:\a\TDT\TDT\TDT-Nightly-Unsigned.zip - name: Set up Python 3.12 uses: actions/setup-python@v5 with: @@ -51,6 +52,7 @@ jobs: repository: 'ntool' - name: Devsign TAD Delivery Tool run: | + cd D:\a\TDT\TDT\ 7z e TDT-Nightly-Unsigned.zip cp TDT.dsi ntool/ cd ntool/ From 9794ebc7842e462f8549081d43f64a0808dc1c42 Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 16 Aug 2024 02:24:28 -0400 Subject: [PATCH 06/14] Update build.yml --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 90b72f2..99dd8b2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,8 +52,9 @@ jobs: repository: 'ntool' - name: Devsign TAD Delivery Tool run: | + dir cd D:\a\TDT\TDT\ - 7z e TDT-Nightly-Unsigned.zip + 7z e D:\a\TDT\TDT\TDT-Nightly-Unsigned.zip cp TDT.dsi ntool/ cd ntool/ pip install pycryptodome From 2ae316443e17752de9a34a7909b6ec0c716c6a15 Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 16 Aug 2024 02:30:50 -0400 Subject: [PATCH 07/14] Update build.yml --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 99dd8b2..c068fda 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,8 +53,7 @@ jobs: - name: Devsign TAD Delivery Tool run: | dir - cd D:\a\TDT\TDT\ - 7z e D:\a\TDT\TDT\TDT-Nightly-Unsigned.zip + 7z e .\TDT-Nightly-Unsigned.zip TDT.dsi cp TDT.dsi ntool/ cd ntool/ pip install pycryptodome From 4eafed393deb817349e3cadd91a59198b1ea24fc Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 16 Aug 2024 02:43:33 -0400 Subject: [PATCH 08/14] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c068fda..9c5c94a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: - name: Devsign TAD Delivery Tool run: | dir - 7z e .\TDT-Nightly-Unsigned.zip TDT.dsi + 7z e TDT-Nightly-Unsigned.zip -oD:\a\TDT\TDT\ cp TDT.dsi ntool/ cd ntool/ pip install pycryptodome From 5d981e43172c9a67227662d5b2af4a2d866b3986 Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 16 Aug 2024 02:48:19 -0400 Subject: [PATCH 09/14] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c5c94a..35b016a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: - name: Devsign TAD Delivery Tool run: | dir - 7z e TDT-Nightly-Unsigned.zip -oD:\a\TDT\TDT\ + tar -xvf TDT-Nightly-Unsigned.zip cp TDT.dsi ntool/ cd ntool/ pip install pycryptodome From 37c7af3136af61d8c5863eb6e4ae51dde9edb0ae Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 16 Aug 2024 02:51:54 -0400 Subject: [PATCH 10/14] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35b016a..1ec2eb9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,6 +29,7 @@ jobs: with: path: "TDT.dsi" name: TDT-Nightly-Unsigned + compression-level: 0 devsign: runs-on: windows-latest From 9238711b3ecaee5cf1835634ee0d2a3ada205659 Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 16 Aug 2024 02:55:06 -0400 Subject: [PATCH 11/14] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1ec2eb9..b66e6f0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,7 @@ jobs: - name: Devsign TAD Delivery Tool run: | dir - tar -xvf TDT-Nightly-Unsigned.zip + 7z e TDT-Nightly-Unsigned.zip cp TDT.dsi ntool/ cd ntool/ pip install pycryptodome From bc01aa18809a3cd742fb38dd4615afd99f401fd5 Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 16 Aug 2024 02:58:58 -0400 Subject: [PATCH 12/14] Update build.yml --- .github/workflows/build.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b66e6f0..3d75c29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: uses: actions/download-artifact@v4 with: name: TDT-Nightly-Unsigned - path: D:\a\TDT\TDT\TDT-Nightly-Unsigned.zip + path: D:\a\TDT\TDT\TDT-Build - name: Set up Python 3.12 uses: actions/setup-python@v5 with: @@ -53,10 +53,8 @@ jobs: repository: 'ntool' - name: Devsign TAD Delivery Tool run: | - dir - 7z e TDT-Nightly-Unsigned.zip - cp TDT.dsi ntool/ - cd ntool/ + cp TDT-Build\TDT.dsi ntool + cd ntool pip install pycryptodome python ntool.py srl_retail2dev TDT.dsi - name: Publish devsigned build to GH Actions From 95261ba5b4edb47f59e9ee5b145210ca54a31587 Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 16 Aug 2024 03:01:27 -0400 Subject: [PATCH 13/14] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d75c29..065a409 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,7 +60,7 @@ jobs: - name: Publish devsigned build to GH Actions uses: actions/upload-artifact@v4.3.6 with: - path: "ntool/TDT_dev.dsi" + path: "ntool/TDT_dev.srl" name: TDT-Nightly-Devsigned From e34911cf05625a832d0deab502f8401b7815fdc2 Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 16 Aug 2024 03:07:43 -0400 Subject: [PATCH 14/14] Update build.yml --- .github/workflows/build.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 065a409..1c163ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,6 @@ jobs: with: path: "TDT.dsi" name: TDT-Nightly-Unsigned - compression-level: 0 devsign: runs-on: windows-latest @@ -62,7 +61,17 @@ jobs: with: path: "ntool/TDT_dev.srl" name: TDT-Nightly-Devsigned - + - name: Make a devsigned TAD + run: | + curl https://cdn.randommeaninglesscharacters.com/tools/maketad/maketad.zip -o maketad.zip + 7z e maketad.zip + cp ntool/TDT_dev.srl . + .\maketad-20090604.exe TDT_dev.srl -s -o TDT-Nightly.tad + - name: Publish devsigned TAD to GH Actions + uses: actions/upload-artifact@v4.3.6 + with: + path: "TDT-Nightly.tad" + name: TDT-Nightly-TAD # Only run this for non-PR jobs. publish_build: