From e0265d732b31a5c9332ed74368096598f76076b4 Mon Sep 17 00:00:00 2001
From: Gyanesh Mishra <gyan@PrediMachine.local>
Date: Fri, 1 Dec 2023 17:36:23 -0800
Subject: [PATCH] wjhat

---
 .github/workflows/build-soci.yaml | 37 ++++++++++++++++---------------
 .github/workflows/build.yaml      | 26 +++++++++++-----------
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build-soci.yaml b/.github/workflows/build-soci.yaml
index c0ccca3cc..5f0021d3e 100644
--- a/.github/workflows/build-soci.yaml
+++ b/.github/workflows/build-soci.yaml
@@ -85,25 +85,26 @@ jobs:
           echo $tags
           for tag in $tags
           do
-            sudo ctr i import --base-name $tag --digests /tmp/lorax-${{ steps.meta.outputs.version }}.tar
+            echo $tag
+            # sudo ctr i import --base-name $tag --digests /tmp/lorax-${{ steps.meta.outputs.version }}.tar
           done
           # rm -rf /tmp/lorax-${{ steps.meta.outputs.version }}.tar
 
-      - name: Push image with containerd
-        env:
-          tags: ${{ steps.meta.outputs.tags }}
-        run: |
-          for tag in $tags
-          do
-            sudo ctr i push --user "${{ github.repository_owner }}:${{ secrets.GHCR_PAT }}" $tag
-          done
+      # - name: Push image with containerd
+      #   env:
+      #     tags: ${{ steps.meta.outputs.tags }}
+      #   run: |
+      #     for tag in $tags
+      #     do
+      #       sudo ctr i push --user "${{ github.repository_owner }}:${{ secrets.GHCR_PAT }}" $tag
+      #     done
 
-      - name: Create and push soci index
-        env:
-          tags: ${{ steps.meta.outputs.tags }}
-        run: |
-          for tag in $tags
-          do
-            sudo soci create $tag
-            sudo soci push --user ${{ github.repository_owner }}:${{ secrets.GHCR_PAT }} $tag
-          done
+      # - name: Create and push soci index
+      #   env:
+      #     tags: ${{ steps.meta.outputs.tags }}
+      #   run: |
+      #     for tag in $tags
+      #     do
+      #       sudo soci create $tag
+      #       sudo soci push --user ${{ github.repository_owner }}:${{ secrets.GHCR_PAT }} $tag
+      #     done
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3875d5614..097d23518 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -37,6 +37,12 @@ jobs:
           haskell: true
           large-packages: false
           swap-storage: true
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2.10.0
+
+      - name: Set up containerd for ubuntu
+        uses: crazy-max/ghaction-setup-containerd@v2.2.0
         
       - name: Install soci
         uses: lerentis/soci-installer@v1.0.1
@@ -45,12 +51,6 @@ jobs:
       
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2.1.0
-      
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.10.0
-
-      - name: Set up containerd for ubuntu
-        uses: crazy-max/ghaction-setup-containerd@v2.2.0
 
       - name: Docker meta
         id: meta
@@ -64,13 +64,6 @@ jobs:
             type=sha,prefix=,suffix=,format=short
             type=raw,value=latest
       
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GHCR_PAT }}
-      
       - name: Build Docker image
         uses: docker/build-push-action@v2
         with:
@@ -91,6 +84,13 @@ jobs:
           done
           rm -rf /tmp/lorax-${{ steps.meta.outputs.version }}.tar
 
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GHCR_PAT }}
+
       - name: Push image with containerd
         env:
           tags: ${{ steps.meta.outputs.tags }}