Merge pull request #853 from guydavis/develop

Fixes for new plotter handling and Chia 1.7.0
guydavis · Feb 16, 2023 · f145554 · f145554
2 parents 96577e3 + 0ce426a
commit f145554
Show file tree

Hide file tree

Showing 63 changed files with 943 additions and 385 deletions.
diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
@@ -6,7 +6,7 @@ on:
       - 'develop'
 
 jobs:
-  docker:
+  chia:
     runs-on: ubuntu-22.04
     steps:
       -
@@ -45,8 +45,55 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "CHIA_BRANCH=release/1.7.0"
-            "BLADEBIT_BRANCH=master"
-            "PLOTMAN_BRANCH=development"
+            "BLADEBIT_BRANCH=cuda-compression"
+            "MADMAX_BRANCH=master"
+            "PLOTMAN_BRANCH=compress"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
+
+  gigahorse:
+    runs-on: ubuntu-22.04
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - 
+        name: Login to DockerHub
+        uses: docker/login-action@v2 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2 
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64
+          provenance: false
+          push: true
+          build-args: |
+            "UBUNTU_VER=jammy"
+            "MACHINARIS_STREAM=develop"
+            "CHIADOG_BRANCH=dev"
+            "GIGAHORSE_BRANCH=v1.6.2.giga4"
+            "CHIA_BRANCH=release/1.7.0"
+            "PLOTMAN_BRANCH=development"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:develop
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:develop
+
diff --git a/.github/workflows/develop-chives.yaml b/.github/workflows/develop-chives.yaml
@@ -45,7 +45,8 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
-            "CHIVES_BRANCH=1.5.3"
+            "CHIVES_BRANCH=1.5.4"
+            "MADMAX_BRANCH=master"
             "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:develop

diff --git a/.github/workflows/develop-mmx.yaml b/.github/workflows/develop-mmx.yaml
@@ -45,6 +45,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "MMX_BRANCH=master"
             "CHIA_BRANCH=latest"
+            "MADMAX_BRANCH=master"
             "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:develop

diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
@@ -7,7 +7,7 @@ on:
         description: 'Release Version' 
 
 jobs:
-  docker:
+  chia:
     runs-on: ubuntu-22.04
     steps:
       -
@@ -45,8 +45,55 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
             "CHIA_BRANCH=release/1.7.0"
+            "MADMAX_BRANCH=v1.6.2-1"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:v${{ github.event.inputs.version }}
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:v${{ github.event.inputs.version }}
+
+  gigahorse:
+    runs-on: ubuntu-22.04
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - 
+        name: Login to DockerHub
+        uses: docker/login-action@v2 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2 
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          provenance: false
+          push: true
+          build-args: |
+            "UBUNTU_VER=jammy"
+            "MACHINARIS_STREAM=latest"
+            "GIGAHORSE_BRANCH=v1.6.2.giga4"
+            "CHIA_BRANCH=release/1.7.0"
+            "MADMAX_BRANCH=v1.6.2-1"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:v${{ github.event.inputs.version }}
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/main-chives.yaml b/.github/workflows/main-chives.yaml
@@ -44,7 +44,8 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=latest"
             "CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
-            "CHIVES_BRANCH=1.5.3"
+            "CHIVES_BRANCH=1.5.4"
+            "MADMAX_BRANCH=v1.6.2-1"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:v${{ github.event.inputs.version }}

diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
@@ -44,8 +44,9 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "MMX_BRANCH=v0.9.8"
             "CHIA_BRANCH=latest"
+            "MMX_BRANCH=v0.9.9"
+            "MADMAX_BRANCH=v1.6.2-1"
           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
@@ -6,7 +6,7 @@ on:
       - 'integration'
 
 jobs:
-  docker:
+  chia:
     runs-on: ubuntu-22.04
     steps:
       -
@@ -46,6 +46,52 @@ jobs:
             "CHIADOG_BRANCH=dev"
             "CHIA_BRANCH=release/1.7.0"
             "PLOTMAN_BRANCH=development"
+            "MADMAX_BRANCH=v1.6.2-1"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
+
+  gigahorse:
+    runs-on: ubuntu-22.04
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - 
+        name: Login to DockerHub
+        uses: docker/login-action@v2 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2 
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64
+          provenance: false
+          push: true
+          build-args: |
+            "UBUNTU_VER=jammy"
+            "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
+            "GIGAHORSE_BRANCH=v1.6.2.giga4"
+            "CHIA_BRANCH=release/1.7.0"
+            "PLOTMAN_BRANCH=development"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:test
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:test
diff --git a/.github/workflows/test-chives.yaml b/.github/workflows/test-chives.yaml
@@ -44,7 +44,7 @@ jobs:
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
             "CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
-            "CHIVES_BRANCH=1.5.3"
+            "CHIVES_BRANCH=1.5.4"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:test
@@ -90,6 +90,7 @@ jobs:
             "CHIVES_REPO=https://github.com/foxypool/chives-blockchain.git"
             "CHIVES_BRANCH=main"
             "PLOTMAN_BRANCH=development"
+            "MADMAX_BRANCH=v1.6.2-1"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
@@ -43,9 +43,10 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
-            "MMX_BRANCH=v0.9.8"
             "CHIA_BRANCH=latest"
             "PLOTMAN_BRANCH=development"
+            "MMX_BRANCH=v0.9.9"
+            "MADMAX_BRANCH=v1.6.2-1"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +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).
 
-## [Unreleased]
+## [0.8.7] - 2023-02-16
 ### Added
- - [Bladebit](https://github.com/Chia-Network/bladebit) - support for plotting via GPU (NOT YET, PENDING!)
- - [MMX Cuda Plotter](https://github.com/madMAx43v3r/mmx-binaries/tree/master/mmx-cuda-plotter) - currently only at commandline: `cuda_plot_kXX`. 
+ - Schedule plotting on the "Settings | Plotting" page to take advantage of off-peak electricity, lower your fan noise, avoid backups, etc...
+ - [Bladebit](https://github.com/guydavis/machinaris/wiki/Bladebit) - alpha GPU plotting support in main Machinaris image. Set `mode: gpuplot` under `bladebit` on Settings | Plotting page.
+ - [Gigahorse](https://github.com/guydavis/machinaris/wiki/Gigahorse) - beta GPU plotting and farming support in new Machinaris-Gigahorse image. Set `mode: gpuplot` under `madmax` on Settings | Plotting page.
  - [Ballcoin](https://github.com/ball-network/ballcoin-blockchain) blockchain at version 1.6.0, another slow Silicoin fork.
  - [Pipscoin](https://github.com/Pipscoin-Network/pipscoin-blockchain) blockchain at version 1.7.0.
 ## Changed
@@ -16,11 +17,12 @@ All notable changes to this project will be documented in this file. The format
 ## Updated 
  - [BTCGreen](https://github.com/BTCgreen-Network/btcgreen-blockchain/releases/tag/1.7.0b) to v1.7.0b
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.6.2) to v1.6.2
- - [Chives](https://github.com/HiveProject2021/chives-blockchain/releases/tag/1.5.3) to v1.5.3, including staking.
+ - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.7.0) to v1.7.0
+ - [Chives](https://github.com/HiveProject2021/chives-blockchain/releases/tag/1.5.4) to v1.5.4, including staking.
  - [SHIBGreen](https://github.com/BTCgreen-Network/shibgreen-blockchain/releases/tag/1.7.0.1) to v1.7.0.1
  - [Staicoin](https://github.com/STATION-I/stai-blockchain/releases/tag/1.3.0) to v1.3.0. Note, they require a fresh `config.yaml`.
 ## Notes
- - Support for new Chia forks DOES NOT imply my endorsement for them.  Only run those you are comfortable with.
+ - Support for new blockchains and tools DOES NOT imply my endorsement for them.  *Only run those you are comfortable with.*
 
 ## [0.8.6] - 2023-01-03
 ### Added