From 036c5919d100b2f4beeb5e9696e41f09a14ef2ca Mon Sep 17 00:00:00 2001
From: Alw3ys <alw3ys@gmail.com>
Date: Fri, 15 Mar 2024 07:51:16 +0100
Subject: [PATCH 1/3] docekr runer

---
 .github/workflows/docker-ci.yml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index bdfeedf..e9152eb 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -48,7 +48,15 @@ jobs:
 
   cd:
     needs: ci
-    runs-on: ubuntu-22.04
+    name: 'cd ${{ matrix.target }}'
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            target: linux/amd64
+          - os: macos-latest-xlarge
+            target: linux/arm64
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout
@@ -57,12 +65,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Docker Build
         uses: docker/build-push-action@v5
         with:
@@ -73,6 +75,12 @@ jobs:
           cache-to: type=gha,mode=max
           load: true
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Docker Push
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         uses: docker/build-push-action@v5
@@ -93,4 +101,4 @@ jobs:
           tags: |
             doseiai/dosei
             doseiai/dosei:${{ github.ref_name }}
-          cache-from: type=gha
\ No newline at end of file
+          cache-from: type=gha

From b5359c2594014da7c0c85415e9fb04938ff640e9 Mon Sep 17 00:00:00 2001
From: Alw3ys <alw3ys@gmail.com>
Date: Fri, 15 Mar 2024 07:56:11 +0100
Subject: [PATCH 2/3] try this

---
 .github/workflows/docker-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index e9152eb..da3c669 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -54,7 +54,7 @@ jobs:
         include:
           - os: ubuntu-latest
             target: linux/amd64
-          - os: macos-latest-xlarge
+          - os: macos-latest
             target: linux/arm64
     runs-on: ${{ matrix.os }}
 

From 65839c0fb4e9cfef6e86d156fa99fb77bfbb1c2d Mon Sep 17 00:00:00 2001
From: Alw3ys <alw3ys@gmail.com>
Date: Fri, 15 Mar 2024 08:08:51 +0100
Subject: [PATCH 3/3] done

---
 .github/workflows/docker-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index da3c669..bf09aef 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -54,7 +54,7 @@ jobs:
         include:
           - os: ubuntu-latest
             target: linux/amd64
-          - os: macos-latest
+          - os: self-hosted
             target: linux/arm64
     runs-on: ${{ matrix.os }}