Merge pull request #1018 from guydavis/integration

guydavis · web-flow · commit b8710e941542 · 2025-02-16T17:09:54.000-07:00
Fix issues with arm64
diff --git a/.github/workflows/develop-base.yaml b/.github/workflows/develop-base.yaml
@@ -42,7 +42,7 @@ jobs:
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:develop
 
   docker-jammy:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout
diff --git a/.github/workflows/main-base.yaml b/.github/workflows/main-base.yaml
@@ -42,7 +42,7 @@ jobs:
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:latest
 
   docker-jammy:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout
@@ -72,7 +72,7 @@ jobs:
         with:
           file: docker/dockerfile-jammy.base
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           provenance: false
           push: true
           tags: |
diff --git a/.github/workflows/main-blockchains.yaml b/.github/workflows/main-blockchains.yaml
@@ -38,7 +38,7 @@ jobs:
         with:
           file: docker/dockerfile
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           provenance: false
           push: true
           build-args: |
diff --git a/.github/workflows/test-base.yaml b/.github/workflows/test-base.yaml
@@ -42,7 +42,7 @@ jobs:
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:test
 
   docker-jammy:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout
@@ -72,7 +72,7 @@ jobs:
         with:
           file: docker/dockerfile-jammy.base
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           provenance: false
           push: true
           tags: |
diff --git a/.github/workflows/test-blockchains.yaml b/.github/workflows/test-blockchains.yaml
@@ -37,7 +37,7 @@ jobs:
         with:
           file: docker/dockerfile
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           provenance: false
           push: true
           build-args: |

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ jobs:`
`42`	`42`	`ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:develop`
`43`	`43`
`44`	`44`	`docker-jammy:`
`45`		`- runs-on: ubuntu-24.04`
	`45`	`+ runs-on: ubuntu-22.04`
`46`	`46`	`steps:`
`47`	`47`	`-`
`48`	`48`	`name: Checkout`