From 259db176febbbed8221155c3f2e460a0c7123eb5 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 10:03:49 -0700 Subject: [PATCH 01/24] Move defaults from 3.10 to 3.12 --- .github/workflows/benchmarks.yml | 2 +- .github/workflows/build-linux-installer-deb.yml | 4 ++-- .github/workflows/build-linux-installer-rpm.yml | 4 ++-- .github/workflows/build-macos-installers.yml | 4 ++-- .github/workflows/build-windows-installer.yml | 4 ++-- .github/workflows/test-install-scripts.yml | 2 +- .github/workflows/test-single.yml | 10 ++++------ .github/workflows/test.yml | 12 ++++++------ .github/workflows/upload-pypi-source.yml | 4 ++-- 9 files changed, 22 insertions(+), 24 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index d4a7402b3916..0162294f9ddb 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -56,7 +56,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.10"] + python-version: ["3.12"] env: CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet BLOCKS_AND_PLOTS_VERSION: 0.44.0 diff --git a/.github/workflows/build-linux-installer-deb.yml b/.github/workflows/build-linux-installer-deb.yml index df20dc18a52f..58da1dcc0e65 100644 --- a/.github/workflows/build-linux-installer-deb.yml +++ b/.github/workflows/build-linux-installer-deb.yml @@ -52,7 +52,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.10"] + python-version: ["3.12"] os: - runs-on: ubuntu-latest arch: amd64 @@ -207,7 +207,7 @@ jobs: fail-fast: false matrix: configuration: - - python-version: ["3.10"] + - python-version: ["3.12"] os: - matrix: debian file-type: diff --git a/.github/workflows/build-linux-installer-rpm.yml b/.github/workflows/build-linux-installer-rpm.yml index 7b11db217d0b..39f659a4b9ec 100644 --- a/.github/workflows/build-linux-installer-rpm.yml +++ b/.github/workflows/build-linux-installer-rpm.yml @@ -53,7 +53,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.10"] + python-version: ["3.12"] os: - arch-artifact-name: intel @@ -206,7 +206,7 @@ jobs: fail-fast: false matrix: configuration: - - python-version: ["3.10"] + - python-version: ["3.12"] os: - matrix: redhat file-type: diff --git a/.github/workflows/build-macos-installers.yml b/.github/workflows/build-macos-installers.yml index 0ec86131e18b..1677d3e2586e 100644 --- a/.github/workflows/build-macos-installers.yml +++ b/.github/workflows/build-macos-installers.yml @@ -51,7 +51,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.10"] + python-version: ["3.12"] os: - runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }} name: intel @@ -242,7 +242,7 @@ jobs: fail-fast: false matrix: configuration: - - python-version: ["3.10"] + - python-version: ["3.12"] os: - matrix: macos file-type: diff --git a/.github/workflows/build-windows-installer.yml b/.github/workflows/build-windows-installer.yml index ebe9a8c13ca3..e57b0ea8ded1 100644 --- a/.github/workflows/build-windows-installer.yml +++ b/.github/workflows/build-windows-installer.yml @@ -51,7 +51,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.10"] + python-version: ["3.12"] env: CHIA_INSTALLER_VERSION: ${{ needs.version.outputs.chia-installer-version }} @@ -263,7 +263,7 @@ jobs: fail-fast: false matrix: configuration: - - python-version: ["3.10"] + - python-version: ["3.12"] os: - matrix: windows file-type: diff --git a/.github/workflows/test-install-scripts.yml b/.github/workflows/test-install-scripts.yml index 1b279189cfab..45ce3d6be1e7 100644 --- a/.github/workflows/test-install-scripts.yml +++ b/.github/workflows/test-install-scripts.yml @@ -32,7 +32,7 @@ jobs: fail-fast: false matrix: python: - - major-dot-minor: "3.10" + - major-dot-minor: "3.12" os: - name: Linux emoji: 🐧 diff --git a/.github/workflows/test-single.yml b/.github/workflows/test-single.yml index 3582fc28df17..4dd85d0ec476 100644 --- a/.github/workflows/test-single.yml +++ b/.github/workflows/test-single.yml @@ -76,6 +76,9 @@ jobs: apt: "3.10" install_sh: "3.10" matrix: "3.10" + exclude_from: + limited: True + main: True - name: "3.11" file_name: "3.11" action: "3.11" @@ -87,15 +90,10 @@ jobs: main: True - name: "3.12" file_name: "3.12" - # TODO: https://github.com/python/cpython/issues/128479 - # return to just `3.12` after presumably 3.12.9 becomes available with the fix - action: "3.12.7" + action: "3.12" apt: "3.12" install_sh: "3.12" matrix: "3.12" - exclude_from: - limited: True - main: True exclude: - arch: matrix: arm diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 829eac8879f7..bbfd8df6ae9f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -89,7 +89,7 @@ jobs: - name: Setup Python environment uses: Chia-Network/actions/setup-python@main with: - python-version: "3.10" + python-version: "3.12" - name: Generate matrix configuration id: configure @@ -225,11 +225,11 @@ jobs: name: Ubuntu runs-on: ubuntu-latest python: - - name: "3.10" - action: "3.10" - apt: "3.10" - install_sh: "3.10" - matrix: "3.10" + - name: "3.12" + action: "3.12" + apt: "3.12" + install_sh: "3.12" + matrix: "3.12" steps: - uses: re-actors/alls-green@release/v1.2 diff --git a/.github/workflows/upload-pypi-source.yml b/.github/workflows/upload-pypi-source.yml index 980cddeced08..097fa32926b4 100644 --- a/.github/workflows/upload-pypi-source.yml +++ b/.github/workflows/upload-pypi-source.yml @@ -124,7 +124,7 @@ jobs: - name: Intel matrix: intel python: - - major_dot_minor: "3.10" + - major_dot_minor: "3.12" check: - name: ruff command: ruff format --check --diff . @@ -182,7 +182,7 @@ jobs: strategy: matrix: python: - - major_dot_minor: "3.10" + - major_dot_minor: "3.12" os: [ubuntu-latest] steps: From 7cf6add3fbc9195b735d797117aa0fe3dc841499 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 10:19:59 -0700 Subject: [PATCH 02/24] Setup python3.12 --- .github/workflows/benchmarks.yml | 5 +++++ .github/workflows/build-linux-installer-deb.yml | 5 +++++ .github/workflows/build-linux-installer-rpm.yml | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 0162294f9ddb..8bca959c0ca9 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -73,6 +73,11 @@ jobs: with: fetch-depth: 0 + - name: Set up Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: "3.12" + - uses: chia-network/actions/cache-pip@main with: mode: poetry diff --git a/.github/workflows/build-linux-installer-deb.yml b/.github/workflows/build-linux-installer-deb.yml index 58da1dcc0e65..391e9accad56 100644 --- a/.github/workflows/build-linux-installer-deb.yml +++ b/.github/workflows/build-linux-installer-deb.yml @@ -92,6 +92,11 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Set up Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: "3.12" + - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 with: diff --git a/.github/workflows/build-linux-installer-rpm.yml b/.github/workflows/build-linux-installer-rpm.yml index 39f659a4b9ec..2b3161eca585 100644 --- a/.github/workflows/build-linux-installer-rpm.yml +++ b/.github/workflows/build-linux-installer-rpm.yml @@ -82,6 +82,11 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Set up Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: "3.12" + - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 with: From 47967cb144edd776077ddad3ffea1efd600b61b8 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 10:33:54 -0700 Subject: [PATCH 03/24] debug --- install.sh | 3 +++ setup-poetry.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 61fe53da7bf7..3c68f911b7ef 100755 --- a/install.sh +++ b/install.sh @@ -128,6 +128,9 @@ else PY3_VER=$($INSTALL_PYTHON_PATH --version | cut -d ' ' -f2) PYTHON_MAJOR_VER=$(echo "$PY3_VER" | cut -d'.' -f1) PYTHON_MINOR_VER=$(echo "$PY3_VER" | cut -d'.' -f2) + echo "$PY3_VER" + echo "$PYTHON_MAJOR_VER" + echo "$PYTHON_MINOR_VER" fi if ! command -v "$INSTALL_PYTHON_PATH" >/dev/null; then diff --git a/setup-poetry.sh b/setup-poetry.sh index f90056371bf9..7da519f66fc3 100755 --- a/setup-poetry.sh +++ b/setup-poetry.sh @@ -23,7 +23,7 @@ while getopts c:h flag; do exit 0 ;; *) - echo + echo "temp" usage exit 1 ;; From 2e134e55ce47a5a0455c027b7a95410f96492d7f Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 10:38:08 -0700 Subject: [PATCH 04/24] debug --- install.sh | 4 +--- setup-poetry.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index 3c68f911b7ef..8dcddef8e7bd 100755 --- a/install.sh +++ b/install.sh @@ -128,9 +128,7 @@ else PY3_VER=$($INSTALL_PYTHON_PATH --version | cut -d ' ' -f2) PYTHON_MAJOR_VER=$(echo "$PY3_VER" | cut -d'.' -f1) PYTHON_MINOR_VER=$(echo "$PY3_VER" | cut -d'.' -f2) - echo "$PY3_VER" - echo "$PYTHON_MAJOR_VER" - echo "$PYTHON_MINOR_VER" + echo "$INSTALL_PYTHON_PATH --version" fi if ! command -v "$INSTALL_PYTHON_PATH" >/dev/null; then diff --git a/setup-poetry.sh b/setup-poetry.sh index 7da519f66fc3..f90056371bf9 100755 --- a/setup-poetry.sh +++ b/setup-poetry.sh @@ -23,7 +23,7 @@ while getopts c:h flag; do exit 0 ;; *) - echo "temp" + echo usage exit 1 ;; From b8365efcd24179b1602eb757359a8097e5e9f8a5 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 10:43:22 -0700 Subject: [PATCH 05/24] whoops --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 8dcddef8e7bd..b4ea330181fa 100755 --- a/install.sh +++ b/install.sh @@ -128,7 +128,7 @@ else PY3_VER=$($INSTALL_PYTHON_PATH --version | cut -d ' ' -f2) PYTHON_MAJOR_VER=$(echo "$PY3_VER" | cut -d'.' -f1) PYTHON_MINOR_VER=$(echo "$PY3_VER" | cut -d'.' -f2) - echo "$INSTALL_PYTHON_PATH --version" + echo "$($INSTALL_PYTHON_PATH --version)" fi if ! command -v "$INSTALL_PYTHON_PATH" >/dev/null; then From 18d7ece3f4d44f495fd2950129356aff25be3c32 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 10:47:32 -0700 Subject: [PATCH 06/24] listen I really dont know what Im doing --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index b4ea330181fa..7054b373f539 100755 --- a/install.sh +++ b/install.sh @@ -128,7 +128,7 @@ else PY3_VER=$($INSTALL_PYTHON_PATH --version | cut -d ' ' -f2) PYTHON_MAJOR_VER=$(echo "$PY3_VER" | cut -d'.' -f1) PYTHON_MINOR_VER=$(echo "$PY3_VER" | cut -d'.' -f2) - echo "$($INSTALL_PYTHON_PATH --version)" + echo $($INSTALL_PYTHON_PATH --version) fi if ! command -v "$INSTALL_PYTHON_PATH" >/dev/null; then From caa0fc2a0e633a91cf973a4b6a2e1cd82e15a163 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 10:50:08 -0700 Subject: [PATCH 07/24] debug --- install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install.sh b/install.sh index 7054b373f539..ed159b33339f 100755 --- a/install.sh +++ b/install.sh @@ -125,6 +125,7 @@ if [ "$INSTALL_PYTHON_VERSION" = "" ]; then else echo "Python $INSTALL_PYTHON_VERSION is requested" INSTALL_PYTHON_PATH=python${INSTALL_PYTHON_VERSION} + echo $($INSTALL_PYTHON_PATH --version) PY3_VER=$($INSTALL_PYTHON_PATH --version | cut -d ' ' -f2) PYTHON_MAJOR_VER=$(echo "$PY3_VER" | cut -d'.' -f1) PYTHON_MINOR_VER=$(echo "$PY3_VER" | cut -d'.' -f2) From df23cd5b86a26c930c9b5342feb87ff2d10c794b Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 10:54:44 -0700 Subject: [PATCH 08/24] debug --- install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install.sh b/install.sh index ed159b33339f..df54efd4b6d4 100755 --- a/install.sh +++ b/install.sh @@ -125,11 +125,10 @@ if [ "$INSTALL_PYTHON_VERSION" = "" ]; then else echo "Python $INSTALL_PYTHON_VERSION is requested" INSTALL_PYTHON_PATH=python${INSTALL_PYTHON_VERSION} - echo $($INSTALL_PYTHON_PATH --version) + echo $($INSTALL_PYTHON_PATH --version)"hello" PY3_VER=$($INSTALL_PYTHON_PATH --version | cut -d ' ' -f2) PYTHON_MAJOR_VER=$(echo "$PY3_VER" | cut -d'.' -f1) PYTHON_MINOR_VER=$(echo "$PY3_VER" | cut -d'.' -f2) - echo $($INSTALL_PYTHON_PATH --version) fi if ! command -v "$INSTALL_PYTHON_PATH" >/dev/null; then From 9050ab1cdb893e60225ec2bbfe796293dba0cd0f Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 10:59:49 -0700 Subject: [PATCH 09/24] debug --- .github/actions/install/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml index 5974d171cd61..d5bfd8b1196e 100644 --- a/.github/actions/install/action.yml +++ b/.github/actions/install/action.yml @@ -42,8 +42,8 @@ runs: - name: Run install script (macOS, Ubuntu) if: runner.os == 'macos' || runner.os == 'linux' shell: bash - env: - INSTALL_PYTHON_VERSION: ${{ inputs.python-version }} + # env: + # INSTALL_PYTHON_VERSION: ${{ inputs.python-version }} run: | ${{ inputs.command-prefix }} sh install.sh ${{ inputs.development == 'true' && '-d' || '' }} ${{ (inputs.editable != 'true') && '-i' || '' }} ${{ inputs.legacy_keyring && '-l' || '' }} ${{ inputs.automated == 'true' && '-a' || '' }} ${{ (fromJSON(inputs.do-system-installs) != true) && '-s' || '' }} From 6fe403973759713beb31e77f0728eb3a10c85e73 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 11:03:02 -0700 Subject: [PATCH 10/24] debug --- .github/actions/install/action.yml | 4 ++-- .github/workflows/benchmarks.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml index d5bfd8b1196e..5974d171cd61 100644 --- a/.github/actions/install/action.yml +++ b/.github/actions/install/action.yml @@ -42,8 +42,8 @@ runs: - name: Run install script (macOS, Ubuntu) if: runner.os == 'macos' || runner.os == 'linux' shell: bash - # env: - # INSTALL_PYTHON_VERSION: ${{ inputs.python-version }} + env: + INSTALL_PYTHON_VERSION: ${{ inputs.python-version }} run: | ${{ inputs.command-prefix }} sh install.sh ${{ inputs.development == 'true' && '-d' || '' }} ${{ (inputs.editable != 'true') && '-i' || '' }} ${{ inputs.legacy_keyring && '-l' || '' }} ${{ inputs.automated == 'true' && '-a' || '' }} ${{ (fromJSON(inputs.do-system-installs) != true) && '-s' || '' }} diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 8bca959c0ca9..798f484d38d6 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -73,10 +73,10 @@ jobs: with: fetch-depth: 0 - - name: Set up Python 3.12 - uses: actions/setup-python@v5 - with: - python-version: "3.12" + # - name: Set up Python 3.12 + # uses: actions/setup-python@v5 + # with: + # python-version: "3.12" - uses: chia-network/actions/cache-pip@main with: From b20a8ed1ba30d715bacc30778e5379e84571128c Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 11:07:32 -0700 Subject: [PATCH 11/24] debug --- .github/workflows/benchmarks.yml | 8 ++++---- .github/workflows/build-linux-installer-deb.yml | 10 +++++----- .github/workflows/build-linux-installer-rpm.yml | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 798f484d38d6..8bca959c0ca9 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -73,10 +73,10 @@ jobs: with: fetch-depth: 0 - # - name: Set up Python 3.12 - # uses: actions/setup-python@v5 - # with: - # python-version: "3.12" + - name: Set up Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: "3.12" - uses: chia-network/actions/cache-pip@main with: diff --git a/.github/workflows/build-linux-installer-deb.yml b/.github/workflows/build-linux-installer-deb.yml index 391e9accad56..45e26ed78582 100644 --- a/.github/workflows/build-linux-installer-deb.yml +++ b/.github/workflows/build-linux-installer-deb.yml @@ -52,7 +52,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.12"] + python-version: ["3.10"] os: - runs-on: ubuntu-latest arch: amd64 @@ -92,10 +92,10 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Set up Python 3.12 - uses: actions/setup-python@v5 - with: - python-version: "3.12" + # - name: Set up Python 3.12 + # uses: actions/setup-python@v5 + # with: + # python-version: "3.12" - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 diff --git a/.github/workflows/build-linux-installer-rpm.yml b/.github/workflows/build-linux-installer-rpm.yml index 2b3161eca585..4aecc6701521 100644 --- a/.github/workflows/build-linux-installer-rpm.yml +++ b/.github/workflows/build-linux-installer-rpm.yml @@ -53,7 +53,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.12"] + python-version: ["3.10"] os: - arch-artifact-name: intel @@ -82,10 +82,10 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Set up Python 3.12 - uses: actions/setup-python@v5 - with: - python-version: "3.12" + # - name: Set up Python 3.12 + # uses: actions/setup-python@v5 + # with: + # python-version: "3.12" - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 From 460465ebd190512d4d5934382779186cf9ff9022 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 11:18:29 -0700 Subject: [PATCH 12/24] debug --- .github/workflows/build-linux-installer-deb.yml | 10 +++++----- .github/workflows/build-linux-installer-rpm.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-linux-installer-deb.yml b/.github/workflows/build-linux-installer-deb.yml index 45e26ed78582..8f3cdb60e1bc 100644 --- a/.github/workflows/build-linux-installer-deb.yml +++ b/.github/workflows/build-linux-installer-deb.yml @@ -52,7 +52,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.10"] + python-version: ["3"] os: - runs-on: ubuntu-latest arch: amd64 @@ -92,10 +92,10 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # - name: Set up Python 3.12 - # uses: actions/setup-python@v5 - # with: - # python-version: "3.12" + - name: Set up Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: "3.12" - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 diff --git a/.github/workflows/build-linux-installer-rpm.yml b/.github/workflows/build-linux-installer-rpm.yml index 4aecc6701521..ba0f5832baf9 100644 --- a/.github/workflows/build-linux-installer-rpm.yml +++ b/.github/workflows/build-linux-installer-rpm.yml @@ -53,7 +53,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.10"] + python-version: ["3"] os: - arch-artifact-name: intel @@ -82,10 +82,10 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # - name: Set up Python 3.12 - # uses: actions/setup-python@v5 - # with: - # python-version: "3.12" + - name: Set up Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: "3.12" - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 From e7daacb37eab0da51c2dd26800b0a0f692bc9bae Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 11:21:55 -0700 Subject: [PATCH 13/24] debug --- .github/workflows/build-linux-installer-deb.yml | 9 ++++++++- .github/workflows/build-linux-installer-rpm.yml | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-linux-installer-deb.yml b/.github/workflows/build-linux-installer-deb.yml index 8f3cdb60e1bc..49ab12060c91 100644 --- a/.github/workflows/build-linux-installer-deb.yml +++ b/.github/workflows/build-linux-installer-deb.yml @@ -52,7 +52,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3"] + python-version: ["3.12"] os: - runs-on: ubuntu-latest arch: amd64 @@ -97,6 +97,13 @@ jobs: with: python-version: "3.12" + - name: Show available python binaries + run: | + which python || echo "python not found" + which python3 || echo "python3 not found" + which python3.12 || echo "python3.12 not found" + ls -l $(dirname $(which python3)) | grep python + - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 with: diff --git a/.github/workflows/build-linux-installer-rpm.yml b/.github/workflows/build-linux-installer-rpm.yml index ba0f5832baf9..8e2b5076443f 100644 --- a/.github/workflows/build-linux-installer-rpm.yml +++ b/.github/workflows/build-linux-installer-rpm.yml @@ -53,7 +53,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3"] + python-version: ["3.12"] os: - arch-artifact-name: intel @@ -87,6 +87,13 @@ jobs: with: python-version: "3.12" + - name: Show available python binaries + run: | + which python || echo "python not found" + which python3 || echo "python3 not found" + which python3.12 || echo "python3.12 not found" + ls -l $(dirname $(which python3)) | grep python + - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 with: From b3a6afee9b33c3137412ee062a6752752372652b Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 11:27:36 -0700 Subject: [PATCH 14/24] debug --- .github/workflows/build-linux-installer-deb.yml | 7 ++----- .github/workflows/build-linux-installer-rpm.yml | 7 ++----- install.sh | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-linux-installer-deb.yml b/.github/workflows/build-linux-installer-deb.yml index 49ab12060c91..a295e8de0457 100644 --- a/.github/workflows/build-linux-installer-deb.yml +++ b/.github/workflows/build-linux-installer-deb.yml @@ -97,12 +97,9 @@ jobs: with: python-version: "3.12" - - name: Show available python binaries + - name: Test raw version command run: | - which python || echo "python not found" - which python3 || echo "python3 not found" - which python3.12 || echo "python3.12 not found" - ls -l $(dirname $(which python3)) | grep python + python3.12 --version - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 diff --git a/.github/workflows/build-linux-installer-rpm.yml b/.github/workflows/build-linux-installer-rpm.yml index 8e2b5076443f..ed76fc9aa44d 100644 --- a/.github/workflows/build-linux-installer-rpm.yml +++ b/.github/workflows/build-linux-installer-rpm.yml @@ -87,12 +87,9 @@ jobs: with: python-version: "3.12" - - name: Show available python binaries + - name: Test raw version command run: | - which python || echo "python not found" - which python3 || echo "python3 not found" - which python3.12 || echo "python3.12 not found" - ls -l $(dirname $(which python3)) | grep python + python3.12 --version - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 diff --git a/install.sh b/install.sh index df54efd4b6d4..79208d34160a 100755 --- a/install.sh +++ b/install.sh @@ -125,7 +125,7 @@ if [ "$INSTALL_PYTHON_VERSION" = "" ]; then else echo "Python $INSTALL_PYTHON_VERSION is requested" INSTALL_PYTHON_PATH=python${INSTALL_PYTHON_VERSION} - echo $($INSTALL_PYTHON_PATH --version)"hello" + echo $($INSTALL_PYTHON_PATH --version 2>&1)"hello" PY3_VER=$($INSTALL_PYTHON_PATH --version | cut -d ' ' -f2) PYTHON_MAJOR_VER=$(echo "$PY3_VER" | cut -d'.' -f1) PYTHON_MINOR_VER=$(echo "$PY3_VER" | cut -d'.' -f2) From dcc4d041cc534b7e35484d9bb4ba9b733d11d04a Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 11:43:09 -0700 Subject: [PATCH 15/24] debug --- .github/workflows/build-linux-installer-deb.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-linux-installer-deb.yml b/.github/workflows/build-linux-installer-deb.yml index a295e8de0457..567d80a4b015 100644 --- a/.github/workflows/build-linux-installer-deb.yml +++ b/.github/workflows/build-linux-installer-deb.yml @@ -59,11 +59,13 @@ jobs: madmax-suffix: "x86-64" bladebit-suffix: "ubuntu-x86-64.tar.gz" arch-artifact-name: intel + python-interpreter-arch: x64 - runs-on: ubuntu-24.04-arm arch: arm64 madmax-suffix: "arm64" bladebit-suffix: "ubuntu-arm64.tar.gz" arch-artifact-name: arm + python-interpreter-arch: arm64 env: CHIA_INSTALLER_VERSION: ${{ needs.version.outputs.chia-installer-version }} @@ -96,6 +98,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: "3.12" + architecture: ${{ matrix.os.runs-on.python-interpreter-architecture }} - name: Test raw version command run: | From b5588bcbbebd31e45c29f5e4ae02e53152a6b71a Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Sep 2025 11:49:54 -0700 Subject: [PATCH 16/24] debug --- .github/workflows/build-linux-installer-deb.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-linux-installer-deb.yml b/.github/workflows/build-linux-installer-deb.yml index 567d80a4b015..0190f4f8a4e9 100644 --- a/.github/workflows/build-linux-installer-deb.yml +++ b/.github/workflows/build-linux-installer-deb.yml @@ -59,13 +59,13 @@ jobs: madmax-suffix: "x86-64" bladebit-suffix: "ubuntu-x86-64.tar.gz" arch-artifact-name: intel - python-interpreter-arch: x64 + python-interpreter-arch: "x64" - runs-on: ubuntu-24.04-arm arch: arm64 madmax-suffix: "arm64" bladebit-suffix: "ubuntu-arm64.tar.gz" arch-artifact-name: arm - python-interpreter-arch: arm64 + python-interpreter-arch: "arm64" env: CHIA_INSTALLER_VERSION: ${{ needs.version.outputs.chia-installer-version }} From d30ec1d378b2daec162ae90a7d2f678a682502d1 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 29 Sep 2025 11:02:39 -0700 Subject: [PATCH 17/24] Use Chia action --- .github/workflows/benchmarks.yml | 2 +- .github/workflows/build-linux-installer-deb.yml | 5 +---- .github/workflows/build-linux-installer-rpm.yml | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 8bca959c0ca9..d19277fe3b39 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -74,7 +74,7 @@ jobs: fetch-depth: 0 - name: Set up Python 3.12 - uses: actions/setup-python@v5 + uses: Chia-Network/actions/setup-python@main with: python-version: "3.12" diff --git a/.github/workflows/build-linux-installer-deb.yml b/.github/workflows/build-linux-installer-deb.yml index 0190f4f8a4e9..40246f3d30d3 100644 --- a/.github/workflows/build-linux-installer-deb.yml +++ b/.github/workflows/build-linux-installer-deb.yml @@ -59,13 +59,11 @@ jobs: madmax-suffix: "x86-64" bladebit-suffix: "ubuntu-x86-64.tar.gz" arch-artifact-name: intel - python-interpreter-arch: "x64" - runs-on: ubuntu-24.04-arm arch: arm64 madmax-suffix: "arm64" bladebit-suffix: "ubuntu-arm64.tar.gz" arch-artifact-name: arm - python-interpreter-arch: "arm64" env: CHIA_INSTALLER_VERSION: ${{ needs.version.outputs.chia-installer-version }} @@ -95,10 +93,9 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python 3.12 - uses: actions/setup-python@v5 + uses: Chia-Network/actions/setup-python@main with: python-version: "3.12" - architecture: ${{ matrix.os.runs-on.python-interpreter-architecture }} - name: Test raw version command run: | diff --git a/.github/workflows/build-linux-installer-rpm.yml b/.github/workflows/build-linux-installer-rpm.yml index ed76fc9aa44d..67746a5eac8c 100644 --- a/.github/workflows/build-linux-installer-rpm.yml +++ b/.github/workflows/build-linux-installer-rpm.yml @@ -83,7 +83,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python 3.12 - uses: actions/setup-python@v5 + uses: Chia-Network/actions/setup-python@main with: python-version: "3.12" From 19ca57e8a1553a21b512315c067a45f93c86c18b Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 1 Oct 2025 15:07:50 -0700 Subject: [PATCH 18/24] Use an upstream change --- .github/workflows/build-linux-installer-deb.yml | 2 +- .github/workflows/build-linux-installer-rpm.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-linux-installer-deb.yml b/.github/workflows/build-linux-installer-deb.yml index 40246f3d30d3..1ed9f5a8f435 100644 --- a/.github/workflows/build-linux-installer-deb.yml +++ b/.github/workflows/build-linux-installer-deb.yml @@ -93,7 +93,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python 3.12 - uses: Chia-Network/actions/setup-python@main + uses: Chia-Network/actions/setup-python@quex.add_parametrizations_for_deb_rpm with: python-version: "3.12" diff --git a/.github/workflows/build-linux-installer-rpm.yml b/.github/workflows/build-linux-installer-rpm.yml index 67746a5eac8c..b4feac130ee4 100644 --- a/.github/workflows/build-linux-installer-rpm.yml +++ b/.github/workflows/build-linux-installer-rpm.yml @@ -83,7 +83,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python 3.12 - uses: Chia-Network/actions/setup-python@main + uses: Chia-Network/actions/setup-python@quex.add_parametrizations_for_deb_rpm with: python-version: "3.12" From a880f79312874c84815363bf3bd167777f329284 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 2 Oct 2025 10:53:12 -0700 Subject: [PATCH 19/24] debug --- .github/workflows/build-linux-installer-deb.yml | 6 ++++++ install.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-linux-installer-deb.yml b/.github/workflows/build-linux-installer-deb.yml index 1ed9f5a8f435..52a9c1411d5e 100644 --- a/.github/workflows/build-linux-installer-deb.yml +++ b/.github/workflows/build-linux-installer-deb.yml @@ -101,6 +101,12 @@ jobs: run: | python3.12 --version + - name: Dump env + run: | + echo "PATH is: $PATH" + which python3.12 + python3.12 --version + - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 with: diff --git a/install.sh b/install.sh index 79208d34160a..c838b39091cb 100755 --- a/install.sh +++ b/install.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash - +echo "SCRIPT: PATH is $PATH" set -o errexit USAGE_TEXT="\ From b629fc4d434ccbcf3d9fd98a6690a86eb728fff6 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 2 Oct 2025 11:05:40 -0700 Subject: [PATCH 20/24] Move the python setup to the install action --- .github/actions/install/action.yml | 5 +++++ .github/workflows/build-linux-installer-deb.yml | 15 --------------- .github/workflows/build-linux-installer-rpm.yml | 9 --------- 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml index 5974d171cd61..970ca9d82909 100644 --- a/.github/actions/install/action.yml +++ b/.github/actions/install/action.yml @@ -39,6 +39,11 @@ inputs: runs: using: "composite" steps: + - name: Set up Python ${{ inputs.python-version }} + uses: Chia-Network/actions/setup-python@quex.add_parametrizations_for_deb_rpm + with: + python-version: ${{ inputs.python-version }} + - name: Run install script (macOS, Ubuntu) if: runner.os == 'macos' || runner.os == 'linux' shell: bash diff --git a/.github/workflows/build-linux-installer-deb.yml b/.github/workflows/build-linux-installer-deb.yml index 52a9c1411d5e..58da1dcc0e65 100644 --- a/.github/workflows/build-linux-installer-deb.yml +++ b/.github/workflows/build-linux-installer-deb.yml @@ -92,21 +92,6 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Set up Python 3.12 - uses: Chia-Network/actions/setup-python@quex.add_parametrizations_for_deb_rpm - with: - python-version: "3.12" - - - name: Test raw version command - run: | - python3.12 --version - - - name: Dump env - run: | - echo "PATH is: $PATH" - which python3.12 - python3.12 --version - - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 with: diff --git a/.github/workflows/build-linux-installer-rpm.yml b/.github/workflows/build-linux-installer-rpm.yml index b4feac130ee4..39f659a4b9ec 100644 --- a/.github/workflows/build-linux-installer-rpm.yml +++ b/.github/workflows/build-linux-installer-rpm.yml @@ -82,15 +82,6 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Set up Python 3.12 - uses: Chia-Network/actions/setup-python@quex.add_parametrizations_for_deb_rpm - with: - python-version: "3.12" - - - name: Test raw version command - run: | - python3.12 --version - - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 with: From c153957ab774c5da4354adeeaee2ed766fdefb8e Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 2 Oct 2025 12:33:55 -0700 Subject: [PATCH 21/24] try something dumb --- .github/actions/install/action.yml | 7 +------ .github/workflows/build-linux-installer-deb.yml | 5 +++++ .github/workflows/build-linux-installer-rpm.yml | 9 +++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml index 970ca9d82909..85a9cad1c15c 100644 --- a/.github/actions/install/action.yml +++ b/.github/actions/install/action.yml @@ -39,18 +39,13 @@ inputs: runs: using: "composite" steps: - - name: Set up Python ${{ inputs.python-version }} - uses: Chia-Network/actions/setup-python@quex.add_parametrizations_for_deb_rpm - with: - python-version: ${{ inputs.python-version }} - - name: Run install script (macOS, Ubuntu) if: runner.os == 'macos' || runner.os == 'linux' shell: bash env: INSTALL_PYTHON_VERSION: ${{ inputs.python-version }} run: | - ${{ inputs.command-prefix }} sh install.sh ${{ inputs.development == 'true' && '-d' || '' }} ${{ (inputs.editable != 'true') && '-i' || '' }} ${{ inputs.legacy_keyring && '-l' || '' }} ${{ inputs.automated == 'true' && '-a' || '' }} ${{ (fromJSON(inputs.do-system-installs) != true) && '-s' || '' }} + ${{ inputs.command-prefix }} bash install.sh ${{ inputs.development == 'true' && '-d' || '' }} ${{ (inputs.editable != 'true') && '-i' || '' }} ${{ inputs.legacy_keyring && '-l' || '' }} ${{ inputs.automated == 'true' && '-a' || '' }} ${{ (fromJSON(inputs.do-system-installs) != true) && '-s' || '' }} - name: Run install script (Windows) if: runner.os == 'windows' diff --git a/.github/workflows/build-linux-installer-deb.yml b/.github/workflows/build-linux-installer-deb.yml index 58da1dcc0e65..58b1e65c2440 100644 --- a/.github/workflows/build-linux-installer-deb.yml +++ b/.github/workflows/build-linux-installer-deb.yml @@ -92,6 +92,11 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Set up Python 3.12 + uses: Chia-Network/actions/setup-python@quex.add_parametrizations_for_deb_rpm + with: + python-version: "3.12" + - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 with: diff --git a/.github/workflows/build-linux-installer-rpm.yml b/.github/workflows/build-linux-installer-rpm.yml index 39f659a4b9ec..b4feac130ee4 100644 --- a/.github/workflows/build-linux-installer-rpm.yml +++ b/.github/workflows/build-linux-installer-rpm.yml @@ -82,6 +82,15 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Set up Python 3.12 + uses: Chia-Network/actions/setup-python@quex.add_parametrizations_for_deb_rpm + with: + python-version: "3.12" + + - name: Test raw version command + run: | + python3.12 --version + - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 with: From 3fe8f6e556abb5f53a490eaca61b7ab0c6b48cf6 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 2 Oct 2025 12:44:47 -0700 Subject: [PATCH 22/24] back to sh --- .github/actions/install/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml index 85a9cad1c15c..5974d171cd61 100644 --- a/.github/actions/install/action.yml +++ b/.github/actions/install/action.yml @@ -45,7 +45,7 @@ runs: env: INSTALL_PYTHON_VERSION: ${{ inputs.python-version }} run: | - ${{ inputs.command-prefix }} bash install.sh ${{ inputs.development == 'true' && '-d' || '' }} ${{ (inputs.editable != 'true') && '-i' || '' }} ${{ inputs.legacy_keyring && '-l' || '' }} ${{ inputs.automated == 'true' && '-a' || '' }} ${{ (fromJSON(inputs.do-system-installs) != true) && '-s' || '' }} + ${{ inputs.command-prefix }} sh install.sh ${{ inputs.development == 'true' && '-d' || '' }} ${{ (inputs.editable != 'true') && '-i' || '' }} ${{ inputs.legacy_keyring && '-l' || '' }} ${{ inputs.automated == 'true' && '-a' || '' }} ${{ (fromJSON(inputs.do-system-installs) != true) && '-s' || '' }} - name: Run install script (Windows) if: runner.os == 'windows' From a398219c770d0020c8ba2436dc337fe1329f8da8 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 3 Oct 2025 10:05:01 -0700 Subject: [PATCH 23/24] debug --- install.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/install.sh b/install.sh index c838b39091cb..cd46a82b76f8 100755 --- a/install.sh +++ b/install.sh @@ -1,5 +1,12 @@ #!/usr/bin/env bash echo "SCRIPT: PATH is $PATH" +if grep -qa 'docker\|containerd\|kubepods' /proc/1/cgroup || [ -f /.dockerenv ] || [ -f /run/.containerenv ]; then + echo "Detected container environment." + echo "in_container=true" >> "$GITHUB_OUTPUT" +else + echo "Not running in container." + echo "in_container=false" >> "$GITHUB_OUTPUT" +fi set -o errexit USAGE_TEXT="\ From 5d8d4f1c8f012530d00160f19ae4c3bc658fbb50 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 6 Oct 2025 11:23:38 -0700 Subject: [PATCH 24/24] Cleanup after extensive debug --- .github/workflows/build-linux-installer-rpm.yml | 4 ---- install.sh | 9 --------- 2 files changed, 13 deletions(-) diff --git a/.github/workflows/build-linux-installer-rpm.yml b/.github/workflows/build-linux-installer-rpm.yml index b4feac130ee4..638da378b443 100644 --- a/.github/workflows/build-linux-installer-rpm.yml +++ b/.github/workflows/build-linux-installer-rpm.yml @@ -87,10 +87,6 @@ jobs: with: python-version: "3.12" - - name: Test raw version command - run: | - python3.12 --version - - name: Setup Node per .nvmrc in GUI uses: actions/setup-node@v5 with: diff --git a/install.sh b/install.sh index cd46a82b76f8..436c07b72fd0 100755 --- a/install.sh +++ b/install.sh @@ -1,12 +1,4 @@ #!/usr/bin/env bash -echo "SCRIPT: PATH is $PATH" -if grep -qa 'docker\|containerd\|kubepods' /proc/1/cgroup || [ -f /.dockerenv ] || [ -f /run/.containerenv ]; then - echo "Detected container environment." - echo "in_container=true" >> "$GITHUB_OUTPUT" -else - echo "Not running in container." - echo "in_container=false" >> "$GITHUB_OUTPUT" -fi set -o errexit USAGE_TEXT="\ @@ -132,7 +124,6 @@ if [ "$INSTALL_PYTHON_VERSION" = "" ]; then else echo "Python $INSTALL_PYTHON_VERSION is requested" INSTALL_PYTHON_PATH=python${INSTALL_PYTHON_VERSION} - echo $($INSTALL_PYTHON_PATH --version 2>&1)"hello" PY3_VER=$($INSTALL_PYTHON_PATH --version | cut -d ' ' -f2) PYTHON_MAJOR_VER=$(echo "$PY3_VER" | cut -d'.' -f1) PYTHON_MINOR_VER=$(echo "$PY3_VER" | cut -d'.' -f2)