squashme

chipsalliance · Apr 16, 2023 · b48b19d · b48b19d
1 parent ec6cf35
commit b48b19d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,17 +62,18 @@ jobs:
     - name: Setup homebrew cache
       uses: actions/cache@v3
       with:
-          path: |
-              ~/Library/Caches/Homebrew/boost--*
-              ~/Library/Caches/Homebrew/downloads/*--boost-*
-          key: brew-${{ hashFiles('cpp/perspective/CMakeLists.txt') }}
-          restore-keys: brew-
+        path: |
+            ~/Library/Caches/Homebrew/boost--*
+            ~/Library/Caches/Homebrew/downloads/*--boost-*
+        key: brew-${{ hashFiles('cpp/perspective/CMakeLists.txt') }}
+        restore-keys: brew-
       if: ${{ runner.os == 'macOS' }}
 
     - uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '11'
+      if: ${{ matrix.plugin == 'systemverilog'}}
 
     - name: Install Mac Dependencies
       run: |
@@ -94,6 +95,16 @@ jobs:
       with:
         key: ccache-${{ matrix.os }}
 
+    - name: Install yosys
+      run: |
+          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          set -ex
+
+          git clone https://github.com/YosysHQ/yosys.git
+          pushd yosys
+          make CONFIG=gcc -j`nproc` && sudo make CONFIG=gcc install
+      if: ${{ runner.os != 'macOS' }}
+
     - name: Install yosys
       run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
@@ -102,6 +113,7 @@ jobs:
           git clone https://github.com/YosysHQ/yosys.git
           pushd yosys
           make -j`nproc` && sudo make install
+      if: ${{ runner.os == 'macOS' }}
 
     - name: Install Googletest
       run: |

diff --git a/ql-qlf-plugin/tests/qlf_k6n10f/sim_tc36fifo/sim_tc36fifo.v b/ql-qlf-plugin/tests/qlf_k6n10f/sim_tc36fifo/sim_tc36fifo.v
@@ -6,7 +6,7 @@
 //
 // SPDX-License-Identifier:ISC
 
-`include "qlf_k6n10f/cells_sim.v"
+`include "../../../qlf_k6n10f/cells_sim.v"
 `timescale 1ns/1ps
 
 module tb;