diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index fa5e3e89..30110c0d 100644 --- a/.github/workflows/develop-chia.yaml +++ b/.github/workflows/develop-chia.yaml @@ -82,14 +82,14 @@ jobs: with: file: docker/dockerfile context: . - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 provenance: false push: true build-args: | "UBUNTU_VER=jammy" "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" - "GIGAHORSE_BRANCH=v2.1.1.giga25" + "GIGAHORSE_BRANCH=v2.1.3.giga26" "CHIA_BRANCH=main" "PLOTMAN_BRANCH=compress" tags: | diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml index add10785..4ad46407 100644 --- a/.github/workflows/main-chia.yaml +++ b/.github/workflows/main-chia.yaml @@ -83,13 +83,13 @@ jobs: with: file: docker/dockerfile context: . - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 provenance: false push: true build-args: | "UBUNTU_VER=jammy" "MACHINARIS_STREAM=latest" - "GIGAHORSE_BRANCH=v2.1.1.giga25" + "GIGAHORSE_BRANCH=v2.1.3.giga26" "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 4061f167..2e08fdb2 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.1.1.giga25" + "GIGAHORSE_BRANCH=v2.1.3.giga26" 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 865f6c23..e27aee5d 100644 --- a/.github/workflows/test-chia.yaml +++ b/.github/workflows/test-chia.yaml @@ -82,14 +82,14 @@ jobs: with: file: docker/dockerfile context: . - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 provenance: false push: true build-args: | "UBUNTU_VER=jammy" "MACHINARIS_STREAM=test" "CHIADOG_BRANCH=dev" - "GIGAHORSE_BRANCH=v2.1.1.giga25" + "GIGAHORSE_BRANCH=v2.1.3.giga26" "CHIA_BRANCH=main" "PLOTMAN_BRANCH=development" tags: | diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml index 7d9611fb..e5bd7257 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.1.1.giga25" + "GIGAHORSE_BRANCH=v2.1.3.giga26" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test diff --git a/CHANGELOG.md b/CHANGELOG.md index b9ef0b3b..b9c2eefd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,12 @@ All notable changes to this project will be documented in this file. The format ## Unreleased ### Added - Optionally launch `chia-exporter` [metrics endpoint](https://github.com/Chia-Network/chia-exporter) for Prometheus reporting if env var `chia_exporter=true` is set. + - Support for running Gigahorse containers on arm64 architectures such as Raspberry Pi. ### Changed - Optionally launch of Gigahorse recompute server when in harvester mode if env var `gigahorse_recompute_server=true` is set. ### Updated - - TBD + - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.1.4) to v2.1.4 - misc improvements, see their release notes. + - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.1.3.giga26) to v2.1.3.giga26. ## [2.1.3] - 2023-12-19 ### Updated diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 32b8561d..1c5bb423 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.1.3/chia-blockchain-cli_2.1.3-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.4-rc1/chia-blockchain-cli_2.1.4rc1-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.3/chia-blockchain-cli_2.1.3-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.4-rc1/chia-blockchain-cli_2.1.4rc1-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi diff --git a/scripts/forks/gigahorse_install.sh b/scripts/forks/gigahorse_install.sh index 824ab6d1..54c2ec32 100644 --- a/scripts/forks/gigahorse_install.sh +++ b/scripts/forks/gigahorse_install.sh @@ -15,7 +15,11 @@ else /usr/bin/bash /machinaris/scripts/gpu_drivers_install.sh arch_name="$(uname -m)" - url="https://github.com/madMAx43v3r/chia-gigahorse/releases/download/${GIGAHORSE_BRANCH}/chia-gigahorse-farmer-${GIGAHORSE_VERSION}-${arch_name}.tar.gz" + if [[ "${arch_name}" = "x86_64" ]]; then + url="https://github.com/madMAx43v3r/chia-gigahorse/releases/download/${GIGAHORSE_BRANCH}/chia-gigahorse-farmer-${GIGAHORSE_VERSION}-x86-64.tar.gz" + else + url="https://github.com/madMAx43v3r/chia-gigahorse/releases/download/${GIGAHORSE_BRANCH}/chia-gigahorse-farmer-${GIGAHORSE_VERSION}-aarch64.tar.gz" + fi echo "Pulling Madmax closed-source Chia farming binary from..." echo ${url} cd / && curl --retry 5 --retry-max-time 120 -skJLO ${url}