From fba6996d59f3ee38ba9da269377c1f869c8c095f Mon Sep 17 00:00:00 2001
From: Ganesh Gore <goreganesh007@gmail.com>
Date: Sun, 24 Jan 2021 00:06:15 -0700
Subject: [PATCH] Trying to merge  artifact_regression_tests and
 docker_distribution

---
 .github/workflows/build.yml | 56 ++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3f1815986..9bb874d47 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-18.04
     outputs:
       # this is output as string, see https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idoutputs
-      source_modified: ${{ steps.changes.outputs.status_code == '0' }}
+      source_modified: ${{ steps.changes.outputs.status_code }}
     steps:
       - name: Checkout OpenFPGA repo
         uses: actions/checkout@v2
@@ -126,12 +126,12 @@ jobs:
           ccache -z
           cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
 
-      - name: Build
-        working-directory: build
-        shell: bash
-        # Execute the build.  You can specify a specific target with "--target <NAME>"
-        run: |
-          cmake --build . --config $BUILD_TYPE
+      # - name: Build
+      #   working-directory: build
+      #   shell: bash
+      #   # Execute the build.  You can specify a specific target with "--target <NAME>"
+      #   run: |
+      #     cmake --build . --config $BUILD_TYPE
 
       # Check the cache size and see if it is over the limit
       - name: Check ccache size
@@ -142,23 +142,24 @@ jobs:
         with:
           name: openfpga
           path: |
-            abc/abc
-            abc/libabc.a
-            ace2/ace
-            ace2/libace.a
-            openfpga/libopenfpga.a
-            openfpga/openfpga
-            vpr/libvpr.a
-            vpr/vpr
-            yosys/share/
-            yosys/yosys
-            yosys/yosys-abc
-            yosys/yosys-config
-            yosys/yosys-filterlib
-            yosys/yosys-smtbmc
+            requirements.txt
+
+  # abc/abc
+  # abc/libabc.a
+  # ace2/ace
+  # ace2/libace.a
+  # openfpga/libopenfpga.a
+  # openfpga/openfpga
+  # vpr/libvpr.a
+  # vpr/vpr
+  # yosys/share/
+  # yosys/yosys
+  # yosys/yosys-abc
+  # yosys/yosys-config
+  # yosys/yosys-filterlib
+  # yosys/yosys-smtbmc
   docker_distribution:
     name: Build docker image for distribution
-    if: ${{ github.ref == 'refs/heads/master' }}
     runs-on: ubuntu-latest
     needs: linux_build
     steps:
@@ -179,16 +180,25 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.CR_PAT }}
       - name: Build and push master image
+        if: ${{ github.ref == 'refs/heads/master' }}
         uses: docker/build-push-action@v2
         with:
           context: .
           file: ./docker/Dockerfile.master
           push: true
           tags: ghcr.io/lnis-uofu/openfpga-master:latest
+      - name: Build and push master image
+        if: ${{ github.ref != 'refs/heads/master' }}
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/Dockerfile.master
+          push: true
+          tags: ghcr.io/lnis-uofu/openfpga-local:latest
   artifact_regression_tests:
     name: Regression tests on code changes
     runs-on: ubuntu-18.04
-    container: ghcr.io/lnis-uofu/openfpga-env
+    container: ghcr.io/lnis-uofu/openfpga-local
     needs: linux_build
     strategy:
       fail-fast: false