Merge pull request #1016 from guydavis/integration

Chia v2.5.1
guydavis · Feb 16, 2025 · 29ca45e · 29ca45e
2 parents 110dbf7 + 5bb8df7
commit 29ca45e
Show file tree

Hide file tree

Showing 104 changed files with 207 additions and 4,783 deletions.
diff --git a/.github/workflows/develop-achi.yaml b/.github/workflows/develop-achi.yaml
diff --git a/.github/workflows/develop-apple.yaml b/.github/workflows/develop-apple.yaml
diff --git a/.github/workflows/develop-ballcoin.yaml b/.github/workflows/develop-ballcoin.yaml
diff --git a/.github/workflows/develop-base.yaml b/.github/workflows/develop-base.yaml
@@ -3,8 +3,8 @@ name: develop-base
 on: workflow_dispatch
 
 jobs:
-  docker-jammy:
-    runs-on: ubuntu-22.04
+  docker-noble:
+    runs-on: ubuntu-24.04
     steps:
       -
         name: Checkout
@@ -32,17 +32,17 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: docker/dockerfile-jammy.base
+          file: docker/dockerfile-noble.base
           context: .
           platforms: linux/amd64
           provenance: false
           push: true
           tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:develop
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:develop
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:develop
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:develop
 
-  docker-focal:
-    runs-on: ubuntu-20.04
+  docker-jammy:
+    runs-on: ubuntu-24.04
     steps:
       -
         name: Checkout
@@ -70,11 +70,11 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: docker/dockerfile-focal.base
+          file: docker/dockerfile-jammy.base
           context: .
           platforms: linux/amd64
           provenance: false
           push: true
           tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:develop
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:develop
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:develop
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:develop
diff --git a/.github/workflows/develop-chia.yaml → .github/workflows/develop-blockchains.yaml b/.github/workflows/develop-chia.yaml → .github/workflows/develop-blockchains.yaml
@@ -1,12 +1,12 @@
-name: develop-chia
+name: develop-blockchains
 
 on:
   push:
     branches:
       - 'develop'
 
 jobs:
-  chia:
+  cactus:
     runs-on: ubuntu-22.04
     steps:
       -
@@ -44,15 +44,59 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=2.4.3"
+            "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:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - 
+        name: Login to DockerHub
+        uses: docker/login-action@v2 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2 
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64
+          provenance: false
+          push: true
+          build-args: |
+            "UBUNTU_VER=noble"
+            "MACHINARIS_STREAM=develop"
+            "CHIADOG_BRANCH=dev"
+            "CHIA_BRANCH=2.5.1"
             "BLADEBIT_BRANCH=master"
             "PLOTMAN_BRANCH=compress"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
 
   gigahorse:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       -
         name: Checkout
@@ -86,10 +130,10 @@ jobs:
           provenance: false
           push: true
           build-args: |
-            "UBUNTU_VER=jammy"
+            "UBUNTU_VER=noble"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v2.5.0.giga36"
+            "GIGAHORSE_BRANCH=v2.5.1.giga36"
             "CHIA_BRANCH=main"
             "PLOTMAN_BRANCH=compress"
           tags: |

diff --git a/.github/workflows/develop-btcgreen.yaml b/.github/workflows/develop-btcgreen.yaml
diff --git a/.github/workflows/develop-cactus.yaml b/.github/workflows/develop-cactus.yaml