From 186a0cadfb1d54e493d7198ef4375e0c56b0516a Mon Sep 17 00:00:00 2001
From: ganeshgore <goreganesh007@gmail.com>
Date: Sat, 30 Jan 2021 09:40:53 -0700
Subject: [PATCH] Checking complete flow of build.yml from non master branch 
 (#207)

* [CICD] SHA extraction bug fix

* [CICD] Docker image builds but push from master

* [CICD] General cleanup
---
 .github/workflows/build.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 85d7c8e83..1326b2fd3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -167,9 +167,8 @@ jobs:
             openfpga.sh
   docker_distribution:
     name: Build docker image for distribution
-    if: ${{ github.ref == 'refs/heads/master' || fromJSON(needs.change_detect.outputs.force_upload) }}
     runs-on: ubuntu-latest
-    needs: linux_build
+    needs: [linux_build, change_detect]
     steps:
       - name: Checkout OpenFPGA repo
         uses: actions/checkout@v2
@@ -177,9 +176,6 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: openfpga
-      - name: Update dockerignore to add openfpga_flow
-        run: |
-          cat .dockerignore
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
@@ -195,12 +191,12 @@ jobs:
         with:
           context: .
           file: ./docker/Dockerfile.master
-          push: true
+          push: ${{ github.ref == 'refs/heads/master' || needs.change_detect.outputs.force_upload }}
           tags: |
             ghcr.io/lnis-uofu/openfpga-master:latest
-            ghcr.io/lnis-uofu/openfpga-master:${{ fromJSON(needs.change_detect.outputs.sha_short) }}
-  artifact_regression_tests:
-    name: Regression tests on code changes
+            ghcr.io/lnis-uofu/openfpga-master:${{ needs.change_detect.outputs.sha_short }}
+  linux_regression_tests:
+    name: linux_regression_tests
     runs-on: ubuntu-18.04
     container: ghcr.io/lnis-uofu/openfpga-env
     needs: linux_build
@@ -245,7 +241,7 @@ jobs:
   docker_regression_tests:
     needs: change_detect
     if: ${{ !fromJSON(needs.change_detect.outputs.source_modified) }}
-    name: Regression tests against master artifacts
+    name: docker_regression_tests
     runs-on: ubuntu-18.04
     container: ghcr.io/lnis-uofu/openfpga-master:latest
     strategy: