From 2e947efc646d737d5ecf9d9a3bcc051d40dd2f18 Mon Sep 17 00:00:00 2001
From: Ashton Snelgrove <ashton.snelgrove@utah.edu>
Date: Fri, 22 Jan 2021 19:50:23 -0700
Subject: [PATCH] Add openfpga.sh and force a master build.

---
 .github/workflows/build.yml | 7 ++++---
 docker/Dockerfile.master    | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e06bc5fae..f59b4554f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,6 +17,7 @@ env:
 # Multiple job to tests
 jobs:
   change_detect:
+    if: false
     name: "Detect code changes"
     runs-on: ubuntu-18.04
     outputs:
@@ -39,7 +40,7 @@ jobs:
   # Test the compilation compatibility
   linux_build:
     needs: change_detect
-    if: ${{ fromJSON(needs.change_detect.outputs.source_modified) || github.ref == 'refs/heads/master' }}
+    if: true #${{ fromJSON(needs.change_detect.outputs.source_modified) || github.ref == 'refs/heads/master' }}
     name: ${{ matrix.config.name }}
     runs-on: ubuntu-18.04
     container: ghcr.io/lnis-uofu/openfpga-build-${{ matrix.config.cc}}
@@ -157,7 +158,7 @@ jobs:
             yosys/yosys-smtbmc
   docker_distribution:
     name: Build docker image for distribution
-    if: ${{ github.ref == 'refs/heads/master' }}
+    if: true #${{ github.ref == 'refs/heads/master' }}
     runs-on: ubuntu-latest
     needs: linux_build
     steps:
@@ -228,7 +229,7 @@ jobs:
     env:
       OPENFPGA_PATH: /__w/OpenFPGA/OpenFPGA
     needs: change_detect
-    if: ${{ !fromJSON(needs.change_detect.outputs.source_modified) }}
+    if: false #${{ !fromJSON(needs.change_detect.outputs.source_modified) }}
     name: Regression tests against master artifacts
     runs-on: ubuntu-18.04
     container: ghcr.io/lnis-uofu/openfpga-master:latest
diff --git a/docker/Dockerfile.master b/docker/Dockerfile.master
index dfaf0e011..9ae9890cf 100644
--- a/docker/Dockerfile.master
+++ b/docker/Dockerfile.master
@@ -8,6 +8,7 @@ COPY yosys/yosys yosys/yosys-abc yosys/yosys-config yosys/yosys-filterlib yosys/
 COPY yosys/share /opt/openfpga/yosys/share
 RUN cd /opt/openfpga && chmod +x abc/abc ace2/ace openfpga/openfpga vpr/vpr yosys/yosys yosys/yosys-abc yosys/yosys-config yosys/yosys-filterlib yosys/yosys-smtbmc
 COPY openfpga_flow /opt/openfpga/openfpga_flow
+COPY openfpga.sh /opt/openfpga/openfpga.sh
 ENV PATH="/opt/openfpga/openfpga:/opt/openfpga/yosys:/opt/openfpga/ace2:/opt/openfpga/abc:/opt/openfpga/vpr:${PATH}"
 ENV OPENFPGA_PATH="/opt/openfpga:${PATH}"
 WORKDIR /opt/openfpga