From e31280dd8cf2d6aff54d3986d3438db1704d3898 Mon Sep 17 00:00:00 2001 From: Ethan Uppal <113849268+ethanuppal@users.noreply.github.com> Date: Fri, 21 Feb 2025 21:37:34 -0500 Subject: [PATCH] ci: Cleaner Verilator install --- .github/workflows/ci.yaml | 18 ++++++++++++++---- .gitignore | 1 + Makefile | 8 -------- version.txt | 1 - 4 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 Makefile delete mode 100644 version.txt diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c8ff760..3ffd699 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,8 +20,13 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Swatinem/rust-cache@v2 - - name: Install verilator - run: make install_verilator + - name: Install Verilator + run: | + if [[ "$(uname)" == 'Darwin' ]]; then + brew install verilator + else + sudo apt-get install -y verilator + fi - name: Manual test run: | cd examples/verilog-project @@ -42,8 +47,13 @@ jobs: - uses: actions/checkout@v4 - name: Rust Caching uses: Swatinem/rust-cache@v2 - - name: Install verilator - run: make install_verilator + - name: Install Verilator + run: | + if [[ "$(uname)" == 'Darwin' ]]; then + brew install verilator + else + sudo apt-get install -y verilator + fi - name: Install swim run: cargo install --locked --git https://gitlab.com/spade-lang/swim --rev 639c5d88db76ef3454af4feef842c37985ca1943 - name: Test diff --git a/.gitignore b/.gitignore index 97283a3..65b6e5b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ target/ **/artifacts2/ **/artifacts3/ docs/ +version.txt diff --git a/Makefile b/Makefile deleted file mode 100644 index fbf3255..0000000 --- a/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -UNAME := $(shell uname) - -install_verilator: -ifeq ($(UNAME), Darwin) - brew install verilator -else - sudo apt-get install -y verilator -endif diff --git a/version.txt b/version.txt deleted file mode 100644 index 0ea3a94..0000000 --- a/version.txt +++ /dev/null @@ -1 +0,0 @@ -0.2.0