From 933deb988a3f975ba0221789aaa20d2dc238622b Mon Sep 17 00:00:00 2001
From: Christian Prather <christian@luci.com>
Date: Wed, 16 Aug 2023 16:30:40 -0600
Subject: [PATCH] Squash

---
 .github/workflows/deploy-docker.yml | 80 ++++++++++++++++-------------
 1 file changed, 45 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml
index ce63d22..0042c0a 100644
--- a/.github/workflows/deploy-docker.yml
+++ b/.github/workflows/deploy-docker.yml
@@ -1,46 +1,56 @@
 name: Create and Deploy Docker
 
 on:
-  push:
-  workflow_dispatch:
-    inputs:
-      DEV:
-        type: boolean
-        description: "If the DEV image should be build"
-        required: true
-        default: false
-      RELEASE:
-        type: boolean
-        description: "If the public RELEASE image should be build"
-        required: true
-        default: false
+    push:
+    workflow_dispatch:
+        inputs:
+        DEV:
+            type: boolean
+            description: "If the DEV image should be build"
+            required: true
+            default: false
+        RELEASE:
+            type: boolean
+            description: "If the public RELEASE image should be build"
+            required: true
+            default: false
 
 env:
-  REPO: ${{github.event.repository.name}}
-  JF_ARTIFACTORY_1: ${{secrets.artifactory_token}}
+    REPO: ${{github.event.repository.name}}
+    JF_ARTIFACTORY_1: ${{secrets.artifactory_token}}
 
 jobs:
-  build-and-deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout SDK Branch
+    checkout-repo:
+        runs-on: ubuntu-latest
+        steps:
+        - name: Checkout SDK Branch
         uses: actions/checkout@v3
         with:
-          ref: ${{ github.ref }}
-          path: ${{env.REPO}}
+            ref: ${{ github.ref }}
+            path: ${{env.REPO}}
 
-      - name: Build and deploy dev
-        uses: jfrog/setup-jfrog-cli@v1
-        if: ${{ github.event.inputs.DEV }}
-      - run: |
-          cd ${{env.REPO}}
-          ./build-and-deploy-dockers.sh -d
-        shell: bash
+    Build-and-deploy-dev:
+        runs-on: ubuntu-latest
+        needs: checkout-repo
+        steps:
+            - name: Build and deploy dev
+            uses: jfrog/setup-jfrog-cli@v1
+            if: ${{ github.event.inputs.DEV }}
+            run: |
+                cd ${{env.REPO}}
+                ./build-and-deploy-dockers.sh -d
+            shell: bash
 
-      - name: Build and deploy release
-        if: ${{ github.event.inputs.RELEASE }}
-        uses: jfrog/setup-jfrog-cli@v1
-      - run: |
-          cd ${{env.REPO}}
-          ./build-and-deploy-dockers.sh -r
-        shell: bash
+    Build-and-deploy-release:
+        runs-on: ubuntu-latest
+        needs: checkout-repo
+        steps:
+            - name: Build and deploy release
+            if: ${{ github.event.inputs.RELEASE }}
+            uses: jfrog/setup-jfrog-cli@v1
+            run: |
+                cd ${{env.REPO}}
+                ./build-and-deploy-dockers.sh -r
+            shell: bash
+
+  
\ No newline at end of file