From c790f991c007d5b7358bbada0608e22efff2466a Mon Sep 17 00:00:00 2001
From: Piotr Wegrzyn <piotro@piotro.eu>
Date: Wed, 29 Nov 2023 13:12:03 +0100
Subject: [PATCH] Simplify build tests

---
 .github/workflows/main.yml | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 839cf499f..54c565eb7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,43 +17,47 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/piotro888/riscv-toolchain:2023.11.15
     timeout-minutes: 10
+    env:
+      PYENV_ROOT: "/root/.pyenv"
+      LC_ALL: "C.UTF8"
+      LANG: "C.UTF8"
+    defaults:
+      run:
+        working-directory: test/external/riscof/
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Setup PATH
+        run: echo "/.pyenv/bin" >> $GITHUB_PATH
+
       - name: Setup pyenv python
         run: |
-          cd test/external/riscof/
-          export PATH=/.pyenv/bin:$PATH PYENV_ROOT=/root/.pyenv
           eval "$(pyenv init --path)"
           pyenv global 3.6.15
           . /venv3.6/bin/activate
 
       - name: Setup arch test suite
         run: |
-          export PATH=/.pyenv/bin:$PATH PYENV_ROOT=/root/.pyenv
-          export LC_ALL=C.UTF-8 LANG=C.UTF-8
-          cd test/external/riscof/
           . /venv3.6/bin/activate
           riscof --verbose info arch-test --clone
           riscof testlist --config=config.ini --suite=riscv-arch-test/riscv-test-suite/ --env=riscv-arch-test/riscv-test-suite/env
 
       - name: Build and run tests on reference and generate Makefiles
         run: |
-          export PATH=/.pyenv/bin:$PATH PYENV_ROOT=/root/.pyenv
-          export LC_ALL=C.UTF-8 LANG=C.UTF-8
-          cd test/external/riscof/
           . /venv3.6/bin/activate
           riscof run --config=config.ini --suite=riscv-arch-test/riscv-test-suite/ --env=riscv-arch-test/riscv-test-suite/env
 
       - name: Build tests for Coreblocks
         run: |
-          MAKEFILE_PATH=test/external/riscof/riscof_work/Makefile.build-DUT-coreblocks ./ci/riscof_run_makefile.sh
+          MAKEFILE_PATH=riscof_work/Makefile.build-DUT-coreblocks ../../../ci/riscof_run_makefile.sh
 
       - uses: actions/upload-artifact@v3
         with:
           name: "riscof-tests"
-          path: test/external/riscof/
+          path: |
+            .
+            !venv3.6/
 
   run-riscof-tests:
     name: Run regression tests (riscv-arch-test)