diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9839ff296..17bfc518e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,12 +20,14 @@ jobs: - name: Install dependencies run: | sudo apt install srecord + sudo apt install verilator libelf-dev sudo mkdir -p /tools/riscv sudo chmod 777 /tools/riscv curl -Ls -o rv32-toolchain.tar.xz "https://github.com/lowRISC/lowrisc-toolchains/releases/download/20230427-1/lowrisc-toolchain-gcc-rv32imcb-20230427-1.tar.xz" sudo tar -C /tools/riscv -xf rv32-toolchain.tar.xz --strip-components=1 #curl -sSfL https://github.com/lowRISC/lowrisc-toolchains/releases/download/20230427-1/lowrisc-toolchain-gcc-rv32imcb-20230427-1.tar.xz | sudo tar -xzf -C /tools/riscv --strip-components=1 echo "/tools/riscv/bin" >> $GITHUB_PATH + pip install -r python-requirements.txt - name: Clang lint run: find -name "*.[cc|c|h]" -exec clang-format -n {} \; @@ -45,3 +47,7 @@ jobs: cd sw/legacy/build make + - name: Build Verilator simulator + run: | + fusesoc --cores-root=. run --target=sim --tool=verilator --setup --build lowrisc:sonata:system --verilator_options="+define+RVFI" + diff --git a/.github/workflows/verilator.yml b/.github/workflows/verilator.yml deleted file mode 100644 index 0390cd116..000000000 --- a/.github/workflows/verilator.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Verilator - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - - name: Install dependencies - run: | - sudo apt install verilator libelf-dev - pip install -r python-requirements.txt - - - name: Build simulator - run: | - fusesoc --cores-root=. run --target=sim --tool=verilator --setup --build lowrisc:sonata:system --verilator_options="+define+RVFI" -