Skip to content

Commit

Permalink
Merge pull request #997 from guydavis/develop
Browse files Browse the repository at this point in the history
Chia @ 2.4.3
  • Loading branch information
guydavis authored Aug 26, 2024
2 parents 42f1305 + 7b85a99 commit 3151b2a
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/develop-chia.yaml
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=2.1.3"
"CHIA_BRANCH=2.4.3"
"BLADEBIT_BRANCH=master"
"PLOTMAN_BRANCH=compress"
tags: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-chia.yaml
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=2.1.3"
"CHIA_BRANCH=2.4.3"
"BLADEBIT_BRANCH=master"
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-chia.yaml
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=2.1.3"
"CHIA_BRANCH=2.4.3"
"PLOTMAN_BRANCH=development"
"BLADEBIT_BRANCH=master"
tags: |
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/forks/chia_install.sh
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.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

Expand Down
21 changes: 11 additions & 10 deletions scripts/pull_3rd_party_libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3151b2a

Please sign in to comment.