From 3926718ea67574cfe606f5feeb42afcce53c3f38 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Sat, 5 Aug 2023 11:27:30 +0200
Subject: [PATCH] Retry at compiling Yosys in the Coriolis install tree.

---
 .github/workflows/regression.yml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
index fd40c1c1..e8ca1d66 100644
--- a/.github/workflows/regression.yml
+++ b/.github/workflows/regression.yml
@@ -41,8 +41,12 @@ jobs:
          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
          cd ${{ github.workspace }}/coriolis-2.x/src/yosys
          make ENABLE_PYOSYS=1 config-gcc
-         sudo make ENABLE_PYOSYS=1 PREFIX=/usr install
-#        make ENABLE_PYOSYS=1 PREFIX=/install PYTHON_DESTDIR=/install/lib64/python3/dist-packages DESTDIR=${{ github.workspace }}/coriolis-2.x/Linux.x86_64/Release.Shared install
+#        sudo make ENABLE_PYOSYS=1 PREFIX=/usr install
+         make ENABLE_PYOSYS=1 PREFIX=/install \
+              PYTHON_DESTDIR=/install/lib64/python3/dist-packages \
+	      DESTDIR=${{ github.workspace }}/coriolis-2.x/Linux.x86_64/Release.Shared \
+              LIBDIR=/install/lib64/yosys \
+	      install
      - name: Build Alliance
        run: |
          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
@@ -59,7 +63,13 @@ jobs:
          cd ${{ github.workspace }}/coriolis-2.x/src/alliance-check-toolkit/benchs
          ../bin/crlenv.py --verbose
          ../bin/gopy.sh --github-runner
-     - name: Archive code coverage results
+     - name: Bundle installed tree
+       uses: actions/upload-artifact@v3
+       with:
+         name: installed-tree
+         path: ${{ github.workspace }}/coriolis-2.x/Linux.x86_64/Release.Shared/install
+         retention-days: 1
+     - name: Archive test design set logs
        uses: actions/upload-artifact@v3
        with:
          name: design-set-full-logs