diff --git a/.github/workflows/develop-blockchains.yaml b/.github/workflows/develop-blockchains.yaml index b253e191..c1dd024d 100644 --- a/.github/workflows/develop-blockchains.yaml +++ b/.github/workflows/develop-blockchains.yaml @@ -6,50 +6,6 @@ on: - 'develop' jobs: - cactus: - runs-on: ubuntu-22.04 - steps: - - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v6 - with: - file: docker/dockerfile - context: . - platforms: linux/amd64 - provenance: false - push: true - build-args: | - "UBUNTU_VER=jammy" - "MACHINARIS_STREAM=develop" - "CHIADOG_BRANCH=dev" - "FDCLI_BRANCH=dev" - "CACTUS_BRANCH=main" - tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cactus:develop - ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cactus:develop - chia: runs-on: ubuntu-24.04 steps: diff --git a/.github/workflows/main-blockchains.yaml b/.github/workflows/main-blockchains.yaml index 8025bf28..d607d47e 100644 --- a/.github/workflows/main-blockchains.yaml +++ b/.github/workflows/main-blockchains.yaml @@ -7,48 +7,6 @@ on: description: 'Release Version' jobs: - cactus: - runs-on: ubuntu-22.04 - steps: - - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v6 - with: - file: docker/dockerfile - context: . - platforms: linux/amd64 - provenance: false - push: true - build-args: | - "UBUNTU_VER=jammy" - "MACHINARIS_STREAM=latest" - "CACTUS_BRANCH=main" - tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cactus:latest - ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cactus:latest - chia: runs-on: ubuntu-24.04 steps: diff --git a/.github/workflows/test-blockchains.yaml b/.github/workflows/test-blockchains.yaml index 4c9e5128..7a5a37d9 100644 --- a/.github/workflows/test-blockchains.yaml +++ b/.github/workflows/test-blockchains.yaml @@ -6,49 +6,6 @@ on: - 'integration' jobs: - cactus: - runs-on: ubuntu-22.04 - steps: - - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v6 - with: - file: docker/dockerfile - context: . - platforms: linux/amd64 - provenance: false - push: true - build-args: | - "UBUNTU_VER=jammy" - "MACHINARIS_STREAM=develop" - "CHIADOG_BRANCH=dev" - "CACTUS_BRANCH=main" - tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cactus:test - ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cactus:test - chia: runs-on: ubuntu-24.04 steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index f8b2fc83..057c5e35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ 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.5.5] - 2025-08-20 +### Added +### Changed + - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.5.5) to v2.5.5 - misc improvements, see their release notes. Not backwards compatible with old versions. + ## [2.5.4] - 2025-05-29 ### Added ### Changed diff --git a/VERSION b/VERSION index d21aa93c..160fe391 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5.4 \ No newline at end of file +2.5.5 \ No newline at end of file diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 96fbdfa6..9166ff67 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.5.4/chia-blockchain-cli_2.5.4-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5/chia-blockchain-cli_2.5.5-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.4/chia-blockchain-cli_2.5.4-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.5/chia-blockchain-cli_2.5.5-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh index 2bab37bc..00f2cea9 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.12.1 -BOOTSTRAP_VERSION=5.3.6 +BSI_VERSION=1.13.1 +BOOTSTRAP_VERSION=5.3.7 BASEPATH=${JS_LIBS_BASEPATH:-/machinaris/web/static/3rd_party} # Mapping library