From 2f8e39f6d52919f50472de065382ded537e3ea2f Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 14 Sep 2023 15:39:38 -0600 Subject: [PATCH 1/3] Chia 2.1.0 testing. --- .github/workflows/develop-chia.yaml | 2 +- .github/workflows/main-chia.yaml | 2 +- .github/workflows/test-chia.yaml | 2 +- CHANGELOG.md | 4 ++-- scripts/forks/chia_install.sh | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index 32815ee9..76180fd6 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=main" + "CHIA_BRANCH=release/2.1.0" "BLADEBIT_BRANCH=master" "MADMAX_BRANCH=master" "PLOTMAN_BRANCH=compress" diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml index 5df3bf05..e6ce871f 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=release/2.0.0" + "CHIA_BRANCH=release/2.1.0" "MADMAX_BRANCH=v1.8.2.giga14" "BLADEBIT_BRANCH=master" tags: | diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml index 2ec86f53..ee1d1fc5 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=release/2.0.0" + "CHIA_BRANCH=release/2.1.0" "PLOTMAN_BRANCH=development" "BLADEBIT_BRANCH=master" "MADMAX_BRANCH=v1.8.2.giga14" diff --git a/CHANGELOG.md b/CHANGELOG.md index 569061d1..ed202177 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,8 @@ All notable changes to this project will be documented in this file. The format ### Added ### Changed ### Updated - - [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v3.1.0-beta1) to v3.1.0-beta1 - - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.0.1) to v2.0.1. - Patches GUI/CLI plotting error that DID NOT AFFECT MACHINARIS 2.0.0 USERS. + - [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v3.1.0-beta1) to v3.1.0-beta1 - Supporting hybrid GPU/disk plotting with either 128 GB or 16 GB RAM. + - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.1.0-rc1) to v2.1.0 - Patches GUI/CLI plotting error that DID NOT AFFECT MACHINARIS 2.0.0 USERS. ## [2.0.0] - 2023-08-24 ### Added diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 7e714db5..65b58f3f 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.0.1/chia-blockchain-cli_2.0.1-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.0-rc1/chia-blockchain-cli_2.1.0rc1-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb elif [[ "${arch_name}" = "arm64" ]]; then - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.1/chia-blockchain-cli_2.0.1-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.0-rc1/chia-blockchain-cli_2.1.0rc1-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb else echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}" From 89bb1d1d5de057640333eb30736b49c1a1468a80 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 14 Sep 2023 15:47:17 -0600 Subject: [PATCH 2/3] Update Javascript libs to latest. --- scripts/pull_3rd_party_libs.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh index 2b8604a8..24888d04 100755 --- a/scripts/pull_3rd_party_libs.sh +++ b/scripts/pull_3rd_party_libs.sh @@ -4,8 +4,8 @@ # # Bootstrap and Icons -BSI_VERSION=1.10.5 -BOOTSTRAP_VERSION=5.3.1 +BSI_VERSION=1.11.0 +BOOTSTRAP_VERSION=5.3.2 BASEPATH=${JS_LIBS_BASEPATH:-/machinaris/web/static/3rd_party} # Mapping library @@ -13,15 +13,15 @@ LEAFLET_VERSION=1.9.4 # List of other css/js links LIST=" -https://cdn.datatables.net/1.13.5/css/dataTables.bootstrap5.css -https://cdn.datatables.net/1.13.5/js/dataTables.bootstrap5.js -https://cdn.datatables.net/1.13.5/js/jquery.dataTables.js -https://cdn.jsdelivr.net/npm/chart.js@4.3.3/dist/chart.umd.js.map -https://cdn.jsdelivr.net/npm/chart.js@4.3.3/dist/chart.umd.min.js +https://cdn.datatables.net/1.13.6/css/dataTables.bootstrap5.css +https://cdn.datatables.net/1.13.6/js/dataTables.bootstrap5.js +https://cdn.datatables.net/1.13.6/js/jquery.dataTables.js +https://cdn.jsdelivr.net/npm/chart.js@4.4.0/dist/chart.umd.js.map +https://cdn.jsdelivr.net/npm/chart.js@4.4.0/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.6.3/dist/jquery.min.js -https://moment.github.io/luxon/global/luxon.min.js" +https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js +https://cdn.jsdelivr.net/npm/luxon@3.4.3/build/global/luxon.min.js" mkdir -p $BASEPATH for url in $LIST ; do From d826ec1829c22dc3029cdbbeec9e030edce0e5ee Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Fri, 15 Sep 2023 08:28:46 -0600 Subject: [PATCH 3/3] Bump version number. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 10bf840e..50aea0e7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.1 \ No newline at end of file +2.1.0 \ No newline at end of file