From 72dc8957ae1e560060665b2bc1e62ea0d269a631 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Fri, 20 Sep 2024 22:44:00 -0400 Subject: [PATCH 1/4] Added flag to skip copying NitroFS files --- filesystem.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/filesystem.mk b/filesystem.mk index cb7f6558..755e6e3c 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -51,6 +51,7 @@ NTR_FILE_EXT := bin NCGR NCLR NCER NSCR NSBMD NSBCA NSBTA .PHONY: filesystem clean-filesystem clean-fs filesystem: $(NITROFS_FILES) clean-language-specific-files +ifeq ($(SKIP_COPY_NITROFS),) cp -r files/language-specific/$(LANGUAGE_SPECIFIC_DIR)/SCRIPT files/SCRIPT cp files/language-specific/$(LANGUAGE_SPECIFIC_DIR)/FONT/banner.bin files/FONT/banner.bin cp files/language-specific/$(LANGUAGE_SPECIFIC_DIR)/FONT/banner_c.bin files/FONT/banner_c.bin @@ -98,6 +99,7 @@ filesystem: $(NITROFS_FILES) clean-language-specific-files cp files/language-specific/$(JP_SPECIFIC_DIR)/SYSTEM/168.srl files/SYSTEM/168.srl cp files/language-specific/$(JP_SPECIFIC_DIR)/SYSTEM/169.srl files/SYSTEM/169.srl cp files/language-specific/$(JP_SPECIFIC_DIR)/SYSTEM/170.srl files/SYSTEM/170.srl +endif ifeq ($(COMPARE),1) $(SHA1SUM) --quiet -c $(WORK_DIR)/$(buildname)/filesystem.sha1 @@ -109,6 +111,7 @@ clean-filesystem: clean-language-specific-files $(RM) -r $(FS_CLEAN_TARGETS) clean-language-specific-files: +ifeq ($(SKIP_COPY_NITROFS),) $(RM) -r files/DWC $(RM) -r files/SCRIPT $(RM) files/BALANCE/item_p.bin @@ -154,3 +157,4 @@ clean-language-specific-files: $(RM) files/SYSTEM/168.srl $(RM) files/SYSTEM/169.srl $(RM) files/SYSTEM/170.srl +endif From 1ae43f73bab0dc8ff129dc3b9ca1791274723e4c Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Fri, 20 Sep 2024 23:15:21 -0400 Subject: [PATCH 2/4] Added JP XMAP to xmap branch --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 284849c5..c7b1886c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -103,6 +103,7 @@ jobs: mkdir -p xmap cp build/pmdsky.us/*.xMAP xmap/pmdskyus.xMAP cp build/pmdsky.eu/*.xMAP xmap/pmdskyeu.xMAP + cp build/pmdsky.jp/*.xMAP xmap/pmdskyjp.xMAP echo "XMAP_COMMIT_MSG=$( git log --format=%s ${GITHUB_SHA} )" >> $GITHUB_ENV - name: Update xMAP From 84255fc42da20fd6645d1405faff4245664f79c2 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Fri, 20 Sep 2024 23:18:04 -0400 Subject: [PATCH 3/4] Updated GHA upload-artifact --- .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 c7b1886c..5e7af15c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,7 +84,7 @@ jobs: - name: Post error upload if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: pmdsky-failure-${{ github.run_id }} path: failure.tar.gz From 3915bf636f4f8885dfded4aa3ed5de019a8695ab Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Fri, 20 Sep 2024 23:34:54 -0400 Subject: [PATCH 4/4] Updated GHA checkout --- .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 5e7af15c..43bef2d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: sudo apt -y --allow-downgrades install --install-recommends winehq-stable - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up repo run: |