From 84111430bead516afc1a0c7e57bb36584cd6bc63 Mon Sep 17 00:00:00 2001
From: Ganesh Gore <goreganesh007@gmail.com>
Date: Fri, 8 Oct 2021 00:37:54 -0600
Subject: [PATCH] Restored yosys paths

---
 .github/workflows/build.yml | 11 +++++------
 docker/Dockerfile.master    |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 62977084a..b66ce3f41 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -157,13 +157,12 @@ jobs:
             openfpga/openfpga
             vpr/libvpr.a
             vpr/vpr
-            yosys/
             yosys/install/share/
-            yosys/install/bin/yosys
-            yosys/install/bin/yosys-abc
-            yosys/install/bin/yosys-config
-            yosys/install/bin/yosys-filterlib
-            yosys/install/bin/yosys-smtbmc
+            yosys/yosys
+            yosys/yosys-abc
+            yosys/yosys-config
+            yosys/yosys-filterlib
+            yosys/yosys-smtbmc
             openfpga_flow
             openfpga.sh
   docker_distribution:
diff --git a/docker/Dockerfile.master b/docker/Dockerfile.master
index 783197ee6..f3eacb953 100644
--- a/docker/Dockerfile.master
+++ b/docker/Dockerfile.master
@@ -3,7 +3,7 @@ RUN mkdir -p /opt/openfpga
 WORKDIR /opt/openfpga
 COPY . /opt/openfpga
 RUN chmod +x abc/abc ace2/ace openfpga/openfpga vpr/vpr
-RUN chmod +x yosys/install/bin/yosys yosys/install/bin/yosys-abc yosys/install/bin/yosys-config yosys/install/bin/yosys-filterlib yosys/install/bin/yosys-smtbmc
-ENV PATH="/opt/openfpga/openfpga:/opt/openfpga/yosys/install/bin:${PATH}"
+RUN chmod +x yosys/yosys yosys/yosys-abc yosys/yosys-config yosys/yosys-filterlib yosys/yosys-smtbmc
+ENV PATH="/opt/openfpga/openfpga:/opt/openfpga/yosys/${PATH}"
 ENV PATH="/opt/openfpga/ace2:/opt/openfpga/abc:/opt/openfpga/vpr:${PATH}"
 ENV OPENFPGA_PATH="/opt/openfpga"