From c4029a78cc85f9b3e87566facc7d2a4c84624123 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Fri, 11 Jul 2025 15:12:16 -0600 Subject: [PATCH 1/6] Testing upcoming Chia 2.5.5 --- CHANGELOG.md | 5 +++++ VERSION | 2 +- scripts/forks/chia_install.sh | 4 ++-- scripts/pull_3rd_party_libs.sh | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8b2fc83..8a9d49a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.5.5] - Unreleased +### Added +### Changed + - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.5.5) to v2.5.5 - misc improvements, see their release notes. + ## [2.5.4] - 2025-05-29 ### Added ### Changed diff --git a/VERSION b/VERSION index d21aa93c..160fe391 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5.4 \ No newline at end of file +2.5.5 \ No newline at end of file diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 96fbdfa6..0acaf1b0 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -27,10 +27,10 @@ else echo "Installing Chia CUDA binaries on ${arch_name}..." cd /tmp if [[ "${arch_name}" == "x86_64" ]]; then - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.4/chia-blockchain-cli_2.5.4-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc1/chia-blockchain-cli_2.5.5-rc1-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.4/chia-blockchain-cli_2.5.4-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc1/chia-blockchain-cli_2.5.5-rc1-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh index 2bab37bc..00f2cea9 100755 --- a/scripts/pull_3rd_party_libs.sh +++ b/scripts/pull_3rd_party_libs.sh @@ -4,8 +4,8 @@ # # Bootstrap and Icons -BSI_VERSION=1.12.1 -BOOTSTRAP_VERSION=5.3.6 +BSI_VERSION=1.13.1 +BOOTSTRAP_VERSION=5.3.7 BASEPATH=${JS_LIBS_BASEPATH:-/machinaris/web/static/3rd_party} # Mapping library From ad1cdaf79929f39a2542290c80c9b224c848502b Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 21 Jul 2025 09:57:47 -0600 Subject: [PATCH 2/6] Chia @ 2.5.5 rc3 --- scripts/forks/chia_install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 0acaf1b0..ca5ec016 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -27,10 +27,10 @@ else echo "Installing Chia CUDA binaries on ${arch_name}..." cd /tmp if [[ "${arch_name}" == "x86_64" ]]; then - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc1/chia-blockchain-cli_2.5.5-rc1-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc3/chia-blockchain-cli_2.5.5-rc3-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc1/chia-blockchain-cli_2.5.5-rc1-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc3/chia-blockchain-cli_2.5.5-rc3-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi From 2ceb162926adf37c97468a17b1a386250ff798ad Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 21 Jul 2025 16:17:20 -0600 Subject: [PATCH 3/6] Removing build of stale blockchain forks. --- .github/workflows/develop-blockchains.yaml | 44 ---------------------- .github/workflows/main-blockchains.yaml | 42 --------------------- .github/workflows/test-blockchains.yaml | 43 --------------------- 3 files changed, 129 deletions(-) diff --git a/.github/workflows/develop-blockchains.yaml b/.github/workflows/develop-blockchains.yaml index b253e191..c1dd024d 100644 --- a/.github/workflows/develop-blockchains.yaml +++ b/.github/workflows/develop-blockchains.yaml @@ -6,50 +6,6 @@ on: - 'develop' jobs: - cactus: - runs-on: ubuntu-22.04 - steps: - - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v6 - with: - file: docker/dockerfile - context: . - platforms: linux/amd64 - provenance: false - push: true - build-args: | - "UBUNTU_VER=jammy" - "MACHINARIS_STREAM=develop" - "CHIADOG_BRANCH=dev" - "FDCLI_BRANCH=dev" - "CACTUS_BRANCH=main" - tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cactus:develop - ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cactus:develop - chia: runs-on: ubuntu-24.04 steps: diff --git a/.github/workflows/main-blockchains.yaml b/.github/workflows/main-blockchains.yaml index 8025bf28..d607d47e 100644 --- a/.github/workflows/main-blockchains.yaml +++ b/.github/workflows/main-blockchains.yaml @@ -7,48 +7,6 @@ on: description: 'Release Version' jobs: - cactus: - runs-on: ubuntu-22.04 - steps: - - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v6 - with: - file: docker/dockerfile - context: . - platforms: linux/amd64 - provenance: false - push: true - build-args: | - "UBUNTU_VER=jammy" - "MACHINARIS_STREAM=latest" - "CACTUS_BRANCH=main" - tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cactus:latest - ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cactus:latest - chia: runs-on: ubuntu-24.04 steps: diff --git a/.github/workflows/test-blockchains.yaml b/.github/workflows/test-blockchains.yaml index 4c9e5128..7a5a37d9 100644 --- a/.github/workflows/test-blockchains.yaml +++ b/.github/workflows/test-blockchains.yaml @@ -6,49 +6,6 @@ on: - 'integration' jobs: - cactus: - runs-on: ubuntu-22.04 - steps: - - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v6 - with: - file: docker/dockerfile - context: . - platforms: linux/amd64 - provenance: false - push: true - build-args: | - "UBUNTU_VER=jammy" - "MACHINARIS_STREAM=develop" - "CHIADOG_BRANCH=dev" - "CACTUS_BRANCH=main" - tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cactus:test - ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cactus:test - chia: runs-on: ubuntu-24.04 steps: From 1266e450d840e55f9c858d1d0f3d5687261e8609 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Fri, 25 Jul 2025 18:39:17 -0600 Subject: [PATCH 4/6] Chia 2.5.5 rc5 --- scripts/forks/chia_install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index ca5ec016..1969256a 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -27,10 +27,10 @@ else echo "Installing Chia CUDA binaries on ${arch_name}..." cd /tmp if [[ "${arch_name}" == "x86_64" ]]; then - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc3/chia-blockchain-cli_2.5.5-rc3-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc5/chia-blockchain-cli_2.5.5-rc5-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc3/chia-blockchain-cli_2.5.5-rc3-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc5/chia-blockchain-cli_2.5.5-rc5-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi From 24ea7304ae52b3619e0ab57ed05e32e036f8bdec Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 12 Aug 2025 13:07:58 -0600 Subject: [PATCH 5/6] Chia 2.5.5 @ rc7 --- scripts/forks/chia_install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 1969256a..6c232b9d 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -27,10 +27,10 @@ else echo "Installing Chia CUDA binaries on ${arch_name}..." cd /tmp if [[ "${arch_name}" == "x86_64" ]]; then - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc5/chia-blockchain-cli_2.5.5-rc5-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc7/chia-blockchain-cli_2.5.5-rc7-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc5/chia-blockchain-cli_2.5.5-rc5-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc7/chia-blockchain-cli_2.5.5-rc7-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi From 839a9884b159b51d96ef1a33d4436a054db453be Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 19 Aug 2025 15:16:20 -0600 Subject: [PATCH 6/6] Chia @ v2.5.5 --- CHANGELOG.md | 4 ++-- scripts/forks/chia_install.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a9d49a6..057c5e35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [2.5.5] - Unreleased +## [2.5.5] - 2025-08-20 ### Added ### Changed - - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.5.5) to v2.5.5 - misc improvements, see their release notes. + - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.5.5) to v2.5.5 - misc improvements, see their release notes. Not backwards compatible with old versions. ## [2.5.4] - 2025-05-29 ### Added diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 6c232b9d..9166ff67 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -27,10 +27,10 @@ else echo "Installing Chia CUDA binaries on ${arch_name}..." cd /tmp if [[ "${arch_name}" == "x86_64" ]]; then - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc7/chia-blockchain-cli_2.5.5-rc7-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5/chia-blockchain-cli_2.5.5-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5-rc7/chia-blockchain-cli_2.5.5-rc7-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5/chia-blockchain-cli_2.5.5-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi