From 3bdd92a37ad90abdfd0181c4978bd58f721a8d4a Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 26 Aug 2024 09:33:19 -0600 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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