From 51fe1a18a7cf06461c965d6c8e1a19675aad1256 Mon Sep 17 00:00:00 2001 From: UmedMuzl <124306572+UmedMuzl@users.noreply.github.com> Date: Sat, 20 Dec 2025 09:50:15 -0600 Subject: [PATCH 1/2] quick little fix --- .github/workflows/release_pages_dev.yml | 2 +- .github/workflows/release_pages_main.yml | 2 +- ap_version.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release_pages_dev.yml b/.github/workflows/release_pages_dev.yml index 76c950803..6f87ecde6 100644 --- a/.github/workflows/release_pages_dev.yml +++ b/.github/workflows/release_pages_dev.yml @@ -40,7 +40,7 @@ jobs: - name: Setup python uses: actions/setup-python@v4.1.0 with: - python-version: 3.12.0 + python-version: 3.13.0 architecture: x64 - name: Install packages diff --git a/.github/workflows/release_pages_main.yml b/.github/workflows/release_pages_main.yml index 81749a150..1e9758bab 100644 --- a/.github/workflows/release_pages_main.yml +++ b/.github/workflows/release_pages_main.yml @@ -39,7 +39,7 @@ jobs: - name: Setup python uses: actions/setup-python@v4.1.0 with: - python-version: 3.12.0 + python-version: 3.13.0 architecture: x64 - name: Install packages diff --git a/ap_version.py b/ap_version.py index fdcac8c9e..d64967f13 100644 --- a/ap_version.py +++ b/ap_version.py @@ -1,3 +1,3 @@ """Holds the version for Archipelago.""" -version = "1.0.56" +version = "1.0.57" From 875d9937301b66d00ca05fd353b4b03ff7dc121a Mon Sep 17 00:00:00 2001 From: UmedMuzl <124306572+UmedMuzl@users.noreply.github.com> Date: Sat, 20 Dec 2025 09:56:05 -0600 Subject: [PATCH 2/2] update workflow --- .github/workflows/release_pages_dev.yml | 20 ++++++++++---------- .github/workflows/release_pages_main.yml | 20 ++++++++++---------- archipelago.json | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release_pages_dev.yml b/.github/workflows/release_pages_dev.yml index 6f87ecde6..83dbbf2d8 100644 --- a/.github/workflows/release_pages_dev.yml +++ b/.github/workflows/release_pages_dev.yml @@ -8,14 +8,14 @@ jobs: runs-on: ubuntu-latest if: contains(github.actor, '[bot]') steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 - - name: Check if ap_version.py version is newer than latest release + - name: Check if archipelago.json version is newer than latest release id: check_version run: | - # Get the version from ap_version.py in the current branch - AP_VERSION=$(python3 -c "exec(open('ap_version.py').read()); print(version)") - echo "Current ap_version.py version: $AP_VERSION" + # Get the version from archipelago.json in the current branch + AP_VERSION=$(jq -r '.world_version' archipelago.json) + echo "Current archipelago.json version: $AP_VERSION" # Get the latest release tag from DK64-Randomizer-Dev LATEST_TAG=$(curl -s https://api.github.com/repos/2dos/DK64-Randomizer-Dev/releases/latest | jq -r .tag_name) @@ -32,13 +32,13 @@ jobs: echo "version_changed=$VERSION_CHANGED" >> $GITHUB_OUTPUT if [ "$VERSION_CHANGED" = "true" ]; then - echo "ap_version.py version ($AP_VERSION) is different from latest release ($LATEST_VERSION)" + echo "archipelago.json version ($AP_VERSION) is different from latest release ($LATEST_VERSION)" else - echo "ap_version.py version ($AP_VERSION) matches latest release ($LATEST_VERSION)" + echo "archipelago.json version ($AP_VERSION) matches latest release ($LATEST_VERSION)" fi - name: Setup python - uses: actions/setup-python@v4.1.0 + uses: actions/setup-python@v6.0.0 with: python-version: 3.13.0 architecture: x64 @@ -80,11 +80,11 @@ jobs: DEST_FOLDER: ./ DEST_PREDEPLOY_CLEANUP: rm -rf ./* - - name: Get version from ap_version.py + - name: Get version from archipelago.json if: steps.check_version.outputs.version_changed == 'true' id: get_version run: | - VERSION=$(python3 -c "exec(open('./deploy-directory/ap_version.py').read()); print(version)") + VERSION=$(jq -r '.world_version' ./deploy-directory/archipelago.json) echo "version=$VERSION" >> $GITHUB_OUTPUT echo "Version: $VERSION" diff --git a/.github/workflows/release_pages_main.yml b/.github/workflows/release_pages_main.yml index 1e9758bab..0c537138b 100644 --- a/.github/workflows/release_pages_main.yml +++ b/.github/workflows/release_pages_main.yml @@ -7,14 +7,14 @@ jobs: build-and-deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 - - name: Check if ap_version.py version is newer than latest release + - name: Check if archipelago.json version is newer than latest release id: check_version run: | - # Get the version from ap_version.py in the current branch - AP_VERSION=$(python3 -c "exec(open('ap_version.py').read()); print(version)") - echo "Current ap_version.py version: $AP_VERSION" + # Get the version from archipelago.json in the current branch + AP_VERSION=$(jq -r '.world_version' archipelago.json) + echo "Current archipelago.json version: $AP_VERSION" # Get the latest release tag from DK64-Randomizer-Release LATEST_TAG=$(curl -s https://api.github.com/repos/2dos/DK64-Randomizer-Release/releases/latest | jq -r .tag_name) @@ -31,13 +31,13 @@ jobs: echo "version_changed=$VERSION_CHANGED" >> $GITHUB_OUTPUT if [ "$VERSION_CHANGED" = "true" ]; then - echo "ap_version.py version ($AP_VERSION) is different from latest release ($LATEST_VERSION)" + echo "archipelago.json version ($AP_VERSION) is different from latest release ($LATEST_VERSION)" else - echo "ap_version.py version ($AP_VERSION) matches latest release ($LATEST_VERSION)" + echo "archipelago.json version ($AP_VERSION) matches latest release ($LATEST_VERSION)" fi - name: Setup python - uses: actions/setup-python@v4.1.0 + uses: actions/setup-python@v6.0.0 with: python-version: 3.13.0 architecture: x64 @@ -79,11 +79,11 @@ jobs: DEST_FOLDER: ./ DEST_PREDEPLOY_CLEANUP: rm -rf ./* - - name: Get version from ap_version.py + - name: Get version from archipelago.json if: steps.check_version.outputs.version_changed == 'true' id: get_version run: | - VERSION=$(python3 -c "exec(open('./deploy-directory/ap_version.py').read()); print(version)") + VERSION=$(jq -r '.world_version' ./deploy-directory/archipelago.json) echo "version=$VERSION" >> $GITHUB_OUTPUT echo "Version: $VERSION" diff --git a/archipelago.json b/archipelago.json index c732b1a0d..0ad8e706a 100644 --- a/archipelago.json +++ b/archipelago.json @@ -1,6 +1,6 @@ { "minimum_ap_version": "0.6.5", - "world_version": "1.0.56", + "world_version": "1.0.57", "authors": ["2dos", "AlmostSeagull", "Ballaam", "Green Bean", "Killklli", "Lrauq", "PoryGone", "Umed"], "version": 7, "compatible_version": 7,