Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chia 2.1.0rc1 #925

Merged
merged 3 commits into from
Sep 15, 2023
Merged

Chia 2.1.0rc1 #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f8e39f
Chia 2.1.0 testing.
guydavis Sep 14, 2023
89bb1d1
Update Javascript libs to latest.
guydavis Sep 14, 2023
d826ec1
Bump version number.
guydavis Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/develop-chia.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-chia.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-chia.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.1
2.1.0
4 changes: 2 additions & 2 deletions scripts/forks/chia_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
18 changes: 9 additions & 9 deletions scripts/pull_3rd_party_libs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@
#

# 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
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
Expand Down