Merge pull request #998 from guydavis/integration

Chia @ 2.4.3
guydavis · Aug 27, 2024 · 5b285eb · 5b285eb
2 parents 2736cc8 + 3151b2a
commit 5b285eb
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 29 deletions.
diff --git 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: |
@@ -89,7 +89,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v2.3.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
@@ -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
@@ -89,7 +89,7 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "GIGAHORSE_BRANCH=v2.3.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
@@ -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.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
@@ -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: |
@@ -89,7 +89,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v2.3.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
@@ -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.1.giga36"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,13 +2,27 @@
 
 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.3] - 2024-08-27
+### Added
+### Changed
+### Updated
+ - [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
+### 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.
+
+## [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
- - Support for new blockchains and tools DOES NOT imply my endorsement for them.  *Only run those you are comfortable with.*
+ - 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

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.4.0
+2.4.3
diff --git 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.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.0/chia-blockchain-cli_2.4.0-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
 

diff --git 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
diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh
@@ -13,26 +13,27 @@ 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/[email protected].1/dist/chart.umd.js.map
-https://cdn.jsdelivr.net/npm/[email protected].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/[email protected].4/dist/chart.umd.js.map
+https://cdn.jsdelivr.net/npm/[email protected].4/dist/chart.umd.min.js
 https://cdn.jsdelivr.net/npm/[email protected]/dist/chartjs-adapter-luxon.umd.min.js
 https://cdn.jsdelivr.net/npm/[email protected]/dist/chartjs-plugin-datalabels.min.js
 https://cdn.jsdelivr.net/npm/[email protected]/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
   wget -nv -O ${BASEPATH}/$(basename $url) "$url"
 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