From e753be80ac6b351257738019fbeaa7dba8e6276d Mon Sep 17 00:00:00 2001 From: Joshua Pang <32785974+Jawshoeuh@users.noreply.github.com> Date: Mon, 10 Nov 2025 13:33:33 -0800 Subject: [PATCH 1/5] Fix Antlr4 Submodule Commit This should make the submodule use a commit of SkyTemple/antlr4/skytemple-fork again. --- antlr4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/antlr4 b/antlr4 index 007a3c6..44cd294 160000 --- a/antlr4 +++ b/antlr4 @@ -1 +1 @@ -Subproject commit 007a3c6cbc7c18217a492b0b38dfe6c0845161d3 +Subproject commit 44cd294f01e5114348b2ef776ca1a3d0037d8ffa From 1efcc5bab556244b915d56c25b533e7ab9e8e7fb Mon Sep 17 00:00:00 2001 From: Joshua Pang <32785974+Jawshoeuh@users.noreply.github.com> Date: Mon, 10 Nov 2025 13:35:06 -0800 Subject: [PATCH 2/5] Version 0.2.4 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 50a0088..9a44d9a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ build-backend = "scikit_build_core.setuptools.build_meta" [project] name = "explorerscript" -version = "0.2.3" +version = "0.2.4" authors = [ { name = 'Marco "Capypara" Köpcke', email = "hello@capypara.de" }, # see GitHub contributors list for additional people. From 6cddebc54dfb21b7c70f9a864d80cb6ae70e8025 Mon Sep 17 00:00:00 2001 From: Joshua Pang <32785974+Jawshoeuh@users.noreply.github.com> Date: Mon, 10 Nov 2025 14:27:47 -0800 Subject: [PATCH 3/5] Bump to windows-2022 image. Due to deprecation of 2019 image. https://github.com/actions/runner-images/issues/12045 --- .github/workflows/build-test-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index be1bf22..66e2f81 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -148,9 +148,9 @@ jobs: arch: x86_64 - os: macos-14 arch: arm64 - - os: windows-2019 + - os: windows-2022 arch: x86 - - os: windows-2019 + - os: windows-2022 arch: AMD64 steps: - name: Checkout From a11ee8d2765f0c7cdc51fd51f1ab3628a23edd2f Mon Sep 17 00:00:00 2001 From: Joshua Pang <32785974+Jawshoeuh@users.noreply.github.com> Date: Mon, 10 Nov 2025 15:14:17 -0800 Subject: [PATCH 4/5] Generalize Windows OS Check When Building --- .github/workflows/build-test-publish.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index 66e2f81..65f313b 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -164,7 +164,7 @@ jobs: run: | perl -i -pe "s/version\s*=\s*\"(.*?)(\.rc.*|\.a.*|\.post.*)?\"/version=\"\1.dev0+${GITHUB_SHA::8}\"/" pyproject.toml - name: Note version - if: matrix.os != 'windows-2019' + if: ${{ !startsWith(matrix.os, 'windows-') }} shell: bash run: | python3 -m venv .yq-venv @@ -172,7 +172,7 @@ jobs: pip install yq echo "PACKAGE_VERSION=$(tomlq '.project.version' pyproject.toml -r)" >> $GITHUB_ENV - name: Note version (Windows) - if: matrix.os == 'windows-2019' + if: ${{ startsWith(matrix.os, 'windows-') }} run: | pipx install yq $env:PACKAGE_VERSION = tomlq.exe '.project.version' pyproject.toml -r @@ -189,12 +189,12 @@ jobs: python-version: "3.12" - name: Download GNU Tar uses: suisei-cn/actions-download-file@v1.6.0 - if: "matrix.os == 'windows-2019'" + if: ${{ startsWith(matrix.os, 'windows-') }} with: url: https://skytemple.org/build_deps/tar.exe target: "C:\\tarout" - name: Prepend GNU Tar to Path - if: "matrix.os == 'windows-2019'" + if: ${{ startsWith(matrix.os, 'windows-') }} shell: powershell run: echo "C:\tarout" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append From 6c9587dda30c005dfd644cef74191e7442113a7b Mon Sep 17 00:00:00 2001 From: Joshua Pang <32785974+Jawshoeuh@users.noreply.github.com> Date: Mon, 10 Nov 2025 17:54:08 -0800 Subject: [PATCH 5/5] Update Antlr4 Submodule --- antlr4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/antlr4 b/antlr4 index 44cd294..6aff9e2 160000 --- a/antlr4 +++ b/antlr4 @@ -1 +1 @@ -Subproject commit 44cd294f01e5114348b2ef776ca1a3d0037d8ffa +Subproject commit 6aff9e24fc2e235167316acec48e2cc960e2c5d1