From e48c89a612ddf1affb4b997cd6f07fcff6e7b232 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 24 Jun 2024 08:51:06 -0600 Subject: [PATCH 01/14] Updates for Chia and Gigahorse. --- .github/workflows/develop-chia.yaml | 2 +- .github/workflows/main-chia.yaml | 2 +- .github/workflows/main-mmx.yaml | 2 +- .github/workflows/test-chia.yaml | 2 +- .github/workflows/test-mmx.yaml | 2 +- CHANGELOG.md | 13 +++++++++++-- scripts/forks/chia_install.sh | 4 ++-- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index 666e14b2..42edae25 100644 --- a/.github/workflows/develop-chia.yaml +++ b/.github/workflows/develop-chia.yaml @@ -89,7 +89,7 @@ jobs: "UBUNTU_VER=jammy" "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" - "GIGAHORSE_BRANCH=v2.3.0.giga36" + "GIGAHORSE_BRANCH=v2.4.0.giga36" "CHIA_BRANCH=main" "PLOTMAN_BRANCH=compress" tags: | diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml index e35adde1..ba5c08de 100644 --- a/.github/workflows/main-chia.yaml +++ b/.github/workflows/main-chia.yaml @@ -89,7 +89,7 @@ jobs: build-args: | "UBUNTU_VER=jammy" "MACHINARIS_STREAM=latest" - "GIGAHORSE_BRANCH=v2.3.0.giga36" + "GIGAHORSE_BRANCH=v2.4.0.giga36" "CHIA_BRANCH=main" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml index 874c7bb3..05d8bf50 100644 --- a/.github/workflows/main-mmx.yaml +++ b/.github/workflows/main-mmx.yaml @@ -46,7 +46,7 @@ jobs: "MACHINARIS_STREAM=latest" "CHIA_BRANCH=latest" "MMX_BRANCH=v0.10.6" - "GIGAHORSE_BRANCH=v2.3.0.giga36" + "GIGAHORSE_BRANCH=v2.4.0.giga36" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:v${{ github.event.inputs.version }} diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml index c8f9b741..1413dbf5 100644 --- a/.github/workflows/test-chia.yaml +++ b/.github/workflows/test-chia.yaml @@ -89,7 +89,7 @@ jobs: "UBUNTU_VER=jammy" "MACHINARIS_STREAM=test" "CHIADOG_BRANCH=dev" - "GIGAHORSE_BRANCH=v2.3.0.giga36" + "GIGAHORSE_BRANCH=v2.4.0.giga36" "CHIA_BRANCH=main" "PLOTMAN_BRANCH=development" tags: | diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml index c0ac65b8..ea7e6709 100644 --- a/.github/workflows/test-mmx.yaml +++ b/.github/workflows/test-mmx.yaml @@ -46,7 +46,7 @@ jobs: "CHIA_BRANCH=latest" "PLOTMAN_BRANCH=development" "MMX_BRANCH=v0.10.6" - "GIGAHORSE_BRANCH=v2.3.0.giga36" + "GIGAHORSE_BRANCH=v2.4.0.giga36" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test diff --git a/CHANGELOG.md b/CHANGELOG.md index 519c9952..a9a63ac3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,14 +2,23 @@ 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.4.0] - 2024-06-24 +## [2.4.1] - Unreleased ### Added ### Changed ### Updated - - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.4.0) to v2.4.0 - misc improvements, see their release notes. + - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.4.1) to v2.4.1 - misc improvements, see their release notes. + - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.4.0.giga36) to v2.4.0.giga36. ### Notes - Support for new blockchains and tools DOES NOT imply my endorsement for them. *Only run those you are comfortable with.* +## [2.4.0] - Unreleased +### Added +### Changed +### Updated + - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.4.0) to v2.4.0 - misc improvements, see their release notes. +### Notes + - Chia X.Y.0 releases have become quite buggy so I'm generally not bothering to release a full Machinaris X.Y.0 to match. + ## [2.3.0] - 2024-05-06 ### Added - Gigahorse: Optionally launch `chia-exporter` [metrics endpoint](https://github.com/Chia-Network/chia-exporter) for Prometheus reporting if env var `chia_exporter=true` is set. diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 941be6ac..2892d16a 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.4.0/chia-blockchain-cli_2.4.0-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.1-rc1/chia-blockchain-cli_2.4.1rc1-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.0/chia-blockchain-cli_2.4.0-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.1-rc1/chia-blockchain-cli_2.4.1rc1-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi From c116d225d98a98263b60d0e6ecc7252902913fa0 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 25 Jun 2024 12:58:33 -0600 Subject: [PATCH 02/14] Chia v2.4.1 - yanbf --- 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 2892d16a..2d166f48 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.4.1-rc1/chia-blockchain-cli_2.4.1rc1-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.1/chia-blockchain-cli_2.4.1-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.1-rc1/chia-blockchain-cli_2.4.1rc1-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.1/chia-blockchain-cli_2.4.1-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi From 2251a1e587e422ef71656ceaed6b4ed22c3b844e Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Fri, 28 Jun 2024 10:50:20 -0600 Subject: [PATCH 03/14] Latest GH --- .github/workflows/develop-chia.yaml | 2 +- .github/workflows/main-chia.yaml | 2 +- .github/workflows/main-mmx.yaml | 2 +- .github/workflows/test-chia.yaml | 2 +- .github/workflows/test-mmx.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index 42edae25..0f801141 100644 --- a/.github/workflows/develop-chia.yaml +++ b/.github/workflows/develop-chia.yaml @@ -89,7 +89,7 @@ jobs: "UBUNTU_VER=jammy" "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" - "GIGAHORSE_BRANCH=v2.4.0.giga36" + "GIGAHORSE_BRANCH=v2.4.1.giga36" "CHIA_BRANCH=main" "PLOTMAN_BRANCH=compress" tags: | diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml index ba5c08de..6debe0f7 100644 --- a/.github/workflows/main-chia.yaml +++ b/.github/workflows/main-chia.yaml @@ -89,7 +89,7 @@ jobs: build-args: | "UBUNTU_VER=jammy" "MACHINARIS_STREAM=latest" - "GIGAHORSE_BRANCH=v2.4.0.giga36" + "GIGAHORSE_BRANCH=v2.4.1.giga36" "CHIA_BRANCH=main" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml index 05d8bf50..e6931e86 100644 --- a/.github/workflows/main-mmx.yaml +++ b/.github/workflows/main-mmx.yaml @@ -46,7 +46,7 @@ jobs: "MACHINARIS_STREAM=latest" "CHIA_BRANCH=latest" "MMX_BRANCH=v0.10.6" - "GIGAHORSE_BRANCH=v2.4.0.giga36" + "GIGAHORSE_BRANCH=v2.4.1.giga36" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:v${{ github.event.inputs.version }} diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml index 1413dbf5..ec21ff85 100644 --- a/.github/workflows/test-chia.yaml +++ b/.github/workflows/test-chia.yaml @@ -89,7 +89,7 @@ jobs: "UBUNTU_VER=jammy" "MACHINARIS_STREAM=test" "CHIADOG_BRANCH=dev" - "GIGAHORSE_BRANCH=v2.4.0.giga36" + "GIGAHORSE_BRANCH=v2.4.1.giga36" "CHIA_BRANCH=main" "PLOTMAN_BRANCH=development" tags: | diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml index ea7e6709..6bfa53bb 100644 --- a/.github/workflows/test-mmx.yaml +++ b/.github/workflows/test-mmx.yaml @@ -46,7 +46,7 @@ jobs: "CHIA_BRANCH=latest" "PLOTMAN_BRANCH=development" "MMX_BRANCH=v0.10.6" - "GIGAHORSE_BRANCH=v2.4.0.giga36" + "GIGAHORSE_BRANCH=v2.4.1.giga36" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test From b108ac30739e35f3653a7968b6a68c3a00ea0305 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 4 Jul 2024 10:40:55 -0600 Subject: [PATCH 04/14] Chia v2.4.2rc1 --- CHANGELOG.md | 11 ++++++++--- scripts/forks/chia_install.sh | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9a63ac3..4582837f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,14 +2,19 @@ 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.4.1] - Unreleased +## [2.4.2] - Unreleased +### Added +### Changed +### Updated + - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.4.2) to v2.4.2 - misc improvements, see their release notes. + - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.4.1.giga36) to v2.4.1.giga36. + +## [2.4.1] - 2024-07-04 ### Added ### Changed ### Updated - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.4.1) to v2.4.1 - misc improvements, see their release notes. - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.4.0.giga36) to v2.4.0.giga36. -### Notes - - Support for new blockchains and tools DOES NOT imply my endorsement for them. *Only run those you are comfortable with.* ## [2.4.0] - Unreleased ### Added diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 2d166f48..13a6d440 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.4.1/chia-blockchain-cli_2.4.1-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.2-rc1/chia-blockchain-cli_2.4.2rc1-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.1/chia-blockchain-cli_2.4.1-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.2-rc1/chia-blockchain-cli_2.4.2rc1-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi From 030317c0a638f9dc4a4b5e47eae1a187eb2acc72 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Fri, 5 Jul 2024 08:21:54 -0600 Subject: [PATCH 05/14] Fix version number. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9183195a..acdc3f1b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.0 \ No newline at end of file +2.4.2 \ No newline at end of file From 49c009e84bf3a5adea48e0c26fadc13c9ba4c9e1 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 11 Jul 2024 12:19:58 -0600 Subject: [PATCH 06/14] Chia v2.4.2 --- 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 13a6d440..205674b6 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.4.2-rc1/chia-blockchain-cli_2.4.2rc1-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.2/chia-blockchain-cli_2.4.2-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.2-rc1/chia-blockchain-cli_2.4.2rc1-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.2/chia-blockchain-cli_2.4.2-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi From ff596b7502b3f204c4227cb8de8af84ec4ceafc6 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 18 Jul 2024 17:27:41 -0600 Subject: [PATCH 07/14] Chia 2.4.3b2 --- VERSION | 2 +- scripts/forks/chia_install.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index acdc3f1b..6550da69 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.2 \ No newline at end of file +2.4.3 \ No newline at end of file diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 205674b6..d99d7a61 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.4.2/chia-blockchain-cli_2.4.2-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.3-b2/chia-blockchain-cli_2.4.3-b2-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.2/chia-blockchain-cli_2.4.2-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.3-b2/chia-blockchain-cli_2.4.3-b2-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi From fa05ccb6fc2c841d830df3b8126544ad3ba696e6 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 6 Aug 2024 09:53:27 -0600 Subject: [PATCH 08/14] Chia @ 2.4.3 --- 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 4582837f..72b5d9ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +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.4.2] - Unreleased +## [2.4.3] - Unreleased ### Added ### Changed ### Updated - - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.4.2) to v2.4.2 - misc improvements, see their release notes. + - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.4.3) to v2.4.3 - misc improvements, see their release notes. - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.4.1.giga36) to v2.4.1.giga36. ## [2.4.1] - 2024-07-04 diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index d99d7a61..332aa20a 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.4.3-b2/chia-blockchain-cli_2.4.3-b2-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.3-rc1/chia-blockchain-cli_2.4.3-rc1-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.3-b2/chia-blockchain-cli_2.4.3-b2-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.3-rc1/chia-blockchain-cli_2.4.3-rc1-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi From 8930826f4fd2213becca296f498415fdc8bc1038 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 7 Aug 2024 14:22:33 -0600 Subject: [PATCH 09/14] Chia @ 2.4.3 rc2 --- 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 332aa20a..3c929992 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.4.3-rc1/chia-blockchain-cli_2.4.3-rc1-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.3-rc2/chia-blockchain-cli_2.4.3-rc2-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.3-rc1/chia-blockchain-cli_2.4.3-rc1-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.3-rc2/chia-blockchain-cli_2.4.3-rc2-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi From 0dd8e47d39954d7152350a8cfe6367d54cf5ff27 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 7 Aug 2024 14:36:02 -0600 Subject: [PATCH 10/14] Another fix for Max repeatedly changing compression types. --- scripts/forks/gigahorse_install.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/forks/gigahorse_install.sh b/scripts/forks/gigahorse_install.sh index 098489a6..5f5fd789 100644 --- a/scripts/forks/gigahorse_install.sh +++ b/scripts/forks/gigahorse_install.sh @@ -23,16 +23,12 @@ else du -hsc chia-gigahorse-farmer* tar -xzf chia-gigahorse-farmer* else - url="https://github.com/madMAx43v3r/chia-gigahorse/releases/download/${GIGAHORSE_BRANCH}/chia-gigahorse-farmer-${GIGAHORSE_VERSION}-aarch64.tar.xz" + url="https://github.com/madMAx43v3r/chia-gigahorse/releases/download/${GIGAHORSE_BRANCH}/chia-gigahorse-farmer-${GIGAHORSE_VERSION}-aarch64.tar.gz" echo "Pulling Madmax closed-source Chia farming binary from..." echo ${url} cd / && curl --retry 5 --retry-max-time 120 -skJLO ${url} du -hsc chia-gigahorse-farmer* cksum chia-gigahorse-farmer* - tar --version - #tar -xzf chia-gigahorse-farmer* # Fails? - which unxz - unxz --version - unxz chia-gigahorse-farmer* + tar -xzf chia-gigahorse-farmer* fi fi From a6d9d1db975b46d01e8930247d6730320ecdd967 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 13 Aug 2024 08:07:41 -0600 Subject: [PATCH 11/14] Chia 2.4.3 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 3c929992..4ca56ba7 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.4.3-rc2/chia-blockchain-cli_2.4.3-rc2-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.3-rc3/chia-blockchain-cli_2.4.3-rc3-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.3-rc2/chia-blockchain-cli_2.4.3-rc2-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.3-rc3/chia-blockchain-cli_2.4.3-rc3-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi From 3bdd92a37ad90abdfd0181c4978bd58f721a8d4a Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 26 Aug 2024 09:33:19 -0600 Subject: [PATCH 12/14] Chia @ v2.4.3 --- CHANGELOG.md | 2 +- scripts/forks/chia_install.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72b5d9ac..7d8bf07f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ 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.4.3] - Unreleased +## [2.4.3] - 2024-08-27 ### Added ### Changed ### Updated diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 4ca56ba7..1be9e563 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.4.3-rc3/chia-blockchain-cli_2.4.3-rc3-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.3/chia-blockchain-cli_2.4.3-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.3-rc3/chia-blockchain-cli_2.4.3-rc3-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.3/chia-blockchain-cli_2.4.3-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi From ad07b6a1c6f3c5efa7335fd678684feff42bf862 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 26 Aug 2024 10:39:55 -0600 Subject: [PATCH 13/14] Latest versions of libs. --- .github/workflows/develop-chia.yaml | 2 +- .github/workflows/main-chia.yaml | 2 +- .github/workflows/test-chia.yaml | 2 +- scripts/pull_3rd_party_libs.sh | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index 0f801141..4988747d 100644 --- a/.github/workflows/develop-chia.yaml +++ b/.github/workflows/develop-chia.yaml @@ -44,7 +44,7 @@ jobs: "UBUNTU_VER=jammy" "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" - "CHIA_BRANCH=2.1.3" + "CHIA_BRANCH=2.4.3" "BLADEBIT_BRANCH=master" "PLOTMAN_BRANCH=compress" tags: | diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml index 6debe0f7..a104af29 100644 --- a/.github/workflows/main-chia.yaml +++ b/.github/workflows/main-chia.yaml @@ -44,7 +44,7 @@ jobs: build-args: | "UBUNTU_VER=jammy" "MACHINARIS_STREAM=latest" - "CHIA_BRANCH=2.1.3" + "CHIA_BRANCH=2.4.3" "BLADEBIT_BRANCH=master" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml index ec21ff85..f34e8736 100644 --- a/.github/workflows/test-chia.yaml +++ b/.github/workflows/test-chia.yaml @@ -44,7 +44,7 @@ jobs: "UBUNTU_VER=jammy" "MACHINARIS_STREAM=test" "CHIADOG_BRANCH=dev" - "CHIA_BRANCH=2.1.3" + "CHIA_BRANCH=2.4.3" "PLOTMAN_BRANCH=development" "BLADEBIT_BRANCH=master" tags: | diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh index 792f38a3..e6c479ab 100755 --- a/scripts/pull_3rd_party_libs.sh +++ b/scripts/pull_3rd_party_libs.sh @@ -13,15 +13,15 @@ LEAFLET_VERSION=1.9.4 # List of other css/js links LIST=" -https://cdn.datatables.net/2.0.0/css/dataTables.bootstrap5.css -https://cdn.datatables.net/2.0.0/js/dataTables.bootstrap5.js -https://cdn.datatables.net/2.0.0/js/dataTables.min.js -https://cdn.jsdelivr.net/npm/chart.js@4.4.1/dist/chart.umd.js.map -https://cdn.jsdelivr.net/npm/chart.js@4.4.1/dist/chart.umd.min.js +https://cdn.datatables.net/2.1.4/css/dataTables.bootstrap5.css +https://cdn.datatables.net/2.1.4/js/dataTables.bootstrap5.js +https://cdn.datatables.net/2.1.4/js/dataTables.min.js +https://cdn.jsdelivr.net/npm/chart.js@4.4.4/dist/chart.umd.js.map +https://cdn.jsdelivr.net/npm/chart.js@4.4.4/dist/chart.umd.min.js https://cdn.jsdelivr.net/npm/chartjs-adapter-luxon@1.3.1/dist/chartjs-adapter-luxon.umd.min.js https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@2.2.0/dist/chartjs-plugin-datalabels.min.js https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js -https://cdn.jsdelivr.net/npm/luxon@3.4.4/build/global/luxon.min.js" +https://cdn.jsdelivr.net/npm/luxon@3.5.0/build/global/luxon.min.js" mkdir -p $BASEPATH for url in $LIST ; do From 7b85a99f3c4b1526a832970c11f3df0ae071d50f Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 26 Aug 2024 13:58:32 -0600 Subject: [PATCH 14/14] Unspool script lines. --- scripts/pull_3rd_party_libs.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh index e6c479ab..96a7b883 100755 --- a/scripts/pull_3rd_party_libs.sh +++ b/scripts/pull_3rd_party_libs.sh @@ -29,10 +29,11 @@ for url in $LIST ; do done # Bootstrap Icons -wget -nv -O ${BASEPATH}/bsi-icons.zip "https://github.com/twbs/icons/releases/download/v${BSI_VERSION}/bootstrap-icons-${BSI_VERSION}.zip" && \ -unzip -q -o ${BASEPATH}/bsi-icons.zip -d $BASEPATH/ && \ -mv $BASEPATH/bootstrap-icons-${BSI_VERSION} $BASEPATH/icons && \ -mv ${BASEPATH}/icons/font/* ${BASEPATH}/icons/ && rmdir ${BASEPATH}/icons/font/ && \ +wget -nv -O ${BASEPATH}/bsi-icons.zip "https://github.com/twbs/icons/releases/download/v${BSI_VERSION}/bootstrap-icons-${BSI_VERSION}.zip" +unzip -q -o ${BASEPATH}/bsi-icons.zip -d $BASEPATH/ +mv $BASEPATH/bootstrap-icons-${BSI_VERSION} $BASEPATH/icons +mv ${BASEPATH}/icons/font/* ${BASEPATH}/icons/ +rmdir ${BASEPATH}/icons/font/ rm -f ${BASEPATH}/bsi-icons.zip # Bootstrap