diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7151ff00c88e..9c0cd14f8b27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,22 +9,25 @@ on: - 'setup.py' - 'requirements.txt' - '*.iss' + - 'worlds/*/archipelago.json' pull_request: paths: - '.github/workflows/build.yml' - 'setup.py' - 'requirements.txt' - '*.iss' + - 'worlds/*/archipelago.json' workflow_dispatch: env: ENEMIZER_VERSION: 7.1 # NOTE: since appimage/appimagetool and appimage/type2-runtime does not have tags anymore, # we check the sha256 and require manual intervention if it was updated. - APPIMAGETOOL_VERSION: continuous - APPIMAGETOOL_X86_64_HASH: '29348a20b80827cd261c28e95172ff828b69d43d4e4e18e3fd069e2c8693c94e' - APPIMAGE_RUNTIME_VERSION: continuous - APPIMAGE_RUNTIME_X86_64_HASH: 'e70ffa9b69b211574d0917adc482dd66f25a0083427b5945783965d55b0b0a8b' + APPIMAGE_FORK: 'PopTracker' + APPIMAGETOOL_VERSION: 'r-2025-11-18' + APPIMAGETOOL_X86_64_HASH: '4577a452b30af2337123fbb383aea154b618e51ad5448c3b62085cbbbfbfd9a2' + APPIMAGE_RUNTIME_VERSION: 'r-2025-11-07' + APPIMAGE_RUNTIME_X86_64_HASH: '27ddd3f78e483fc5f7856e413d7c17092917f8c35bfe3318a0d378aa9435ad17' permissions: # permissions required for attestation id-token: 'write' @@ -139,9 +142,9 @@ jobs: - name: Install build-time dependencies run: | echo "PYTHON=python3.12" >> $GITHUB_ENV - wget -nv https://github.com/AppImage/appimagetool/releases/download/$APPIMAGETOOL_VERSION/appimagetool-x86_64.AppImage + wget -nv https://github.com/$APPIMAGE_FORK/appimagetool/releases/download/$APPIMAGETOOL_VERSION/appimagetool-x86_64.AppImage echo "$APPIMAGETOOL_X86_64_HASH appimagetool-x86_64.AppImage" | sha256sum -c - wget -nv https://github.com/AppImage/type2-runtime/releases/download/$APPIMAGE_RUNTIME_VERSION/runtime-x86_64 + wget -nv https://github.com/$APPIMAGE_FORK/type2-runtime/releases/download/$APPIMAGE_RUNTIME_VERSION/runtime-x86_64 echo "$APPIMAGE_RUNTIME_X86_64_HASH runtime-x86_64" | sha256sum -c chmod a+rx appimagetool-x86_64.AppImage ./appimagetool-x86_64.AppImage --appimage-extract diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cf9ce08faf38..0061dd15b000 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,7 +11,7 @@ on: - "!.github/workflows/**" - ".github/workflows/docker.yml" branches: - - "*" + - "main" tags: - "v?[0-9]+.[0-9]+.[0-9]*" workflow_dispatch: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 147f30942d99..7f81e5750746 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,10 +11,11 @@ env: ENEMIZER_VERSION: 7.1 # NOTE: since appimage/appimagetool and appimage/type2-runtime does not have tags anymore, # we check the sha256 and require manual intervention if it was updated. - APPIMAGETOOL_VERSION: continuous - APPIMAGETOOL_X86_64_HASH: '29348a20b80827cd261c28e95172ff828b69d43d4e4e18e3fd069e2c8693c94e' - APPIMAGE_RUNTIME_VERSION: continuous - APPIMAGE_RUNTIME_X86_64_HASH: 'e70ffa9b69b211574d0917adc482dd66f25a0083427b5945783965d55b0b0a8b' + APPIMAGE_FORK: 'PopTracker' + APPIMAGETOOL_VERSION: 'r-2025-11-18' + APPIMAGETOOL_X86_64_HASH: '4577a452b30af2337123fbb383aea154b618e51ad5448c3b62085cbbbfbfd9a2' + APPIMAGE_RUNTIME_VERSION: 'r-2025-11-07' + APPIMAGE_RUNTIME_X86_64_HASH: '27ddd3f78e483fc5f7856e413d7c17092917f8c35bfe3318a0d378aa9435ad17' permissions: # permissions required for attestation id-token: 'write' @@ -127,9 +128,9 @@ jobs: - name: Install build-time dependencies run: | echo "PYTHON=python3.12" >> $GITHUB_ENV - wget -nv https://github.com/AppImage/appimagetool/releases/download/$APPIMAGETOOL_VERSION/appimagetool-x86_64.AppImage + wget -nv https://github.com/$APPIMAGE_FORK/appimagetool/releases/download/$APPIMAGETOOL_VERSION/appimagetool-x86_64.AppImage echo "$APPIMAGETOOL_X86_64_HASH appimagetool-x86_64.AppImage" | sha256sum -c - wget -nv https://github.com/AppImage/type2-runtime/releases/download/$APPIMAGE_RUNTIME_VERSION/runtime-x86_64 + wget -nv https://github.com/$APPIMAGE_FORK/type2-runtime/releases/download/$APPIMAGE_RUNTIME_VERSION/runtime-x86_64 echo "$APPIMAGE_RUNTIME_X86_64_HASH runtime-x86_64" | sha256sum -c chmod a+rx appimagetool-x86_64.AppImage ./appimagetool-x86_64.AppImage --appimage-extract diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 90a5d70b8e0c..b08b389005ec 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -59,7 +59,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install pytest pytest-subtests pytest-xdist + pip install -r ci-requirements.txt python ModuleUpdate.py --yes --force --append "WebHostLib/requirements.txt" python Launcher.py --update_settings # make sure host.yaml exists for tests - name: Unittests diff --git a/.gitignore b/.gitignore index 3bb4e68c9924..3064aecef939 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ *.gb *.gbc *.gba +*.nds *.wixobj *.lck *.db3 @@ -63,6 +64,7 @@ Output Logs/ /installdelete.iss /data/user.kv /datapackage +/datapackage_export.json /custom_worlds # Byte-compiled / optimized / DLL files diff --git a/.run/Build APWorld.run.xml b/.run/Build APWorld.run.xml index db6a305e7bb3..fe41bfe48945 100644 --- a/.run/Build APWorld.run.xml +++ b/.run/Build APWorld.run.xml @@ -12,8 +12,8 @@