From 1fabea8b40a39a9a770cb8c25b14c7ea48365f23 Mon Sep 17 00:00:00 2001 From: Nathanael Huffman Date: Thu, 14 Nov 2024 20:35:08 -0600 Subject: [PATCH] Remove deprecated test --- .github/workflows/build.yml | 64 ++++++++++++++++++++++++++++++++ .github/workflows/simulation.yml | 2 +- hdl/ip/vhd/vunit_components/BUCK | 7 ---- 3 files changed, 65 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e69de29b..566a3971 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -0,0 +1,64 @@ +name: fpga-build +run-name: ${{ github.actor }} Building FPGA bitstreams +on: + workflow_run: + workflows: ["simulation"] + types: + - completed +jobs: + changes: + runs-on: self-hosted + permissions: + pull-requests: read + outputs: + cobble: ${{ steps.filter.outputs.cobble }} + buck2: ${{ steps.filter.outputs.buck2 }} + steps: + - uses: actions/checkout@v4 + with: + submodules: 'true' + - uses: dorny/paths-filter@v3 + id: filter + with: + filters: .github/filters.yml + + grapefruit: + needs: changes + if: ${{ needs.changes.outputs.buck2 == 'true' }} + runs-on: self-hosted + steps: + - run: echo "The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." + - name: Check out repository code + uses: actions/checkout@v4 + with: + submodules: 'true' + - name: Update pip reqs + run : python3 -m pip install --upgrade -r tools/requirements.txt --break-system-packages + - name: Build grapefruit bitstream + run: buck2 build //hdl/projects/grapefruit:grapefruit --show-output + + bsv_streams: + needs: changes + if: ${{ needs.changes.outputs.buck2 == 'true' }} + runs-on: self-hosted + steps: + - run: echo "The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." + - name: Check out repository code + uses: actions/checkout@v4 + with: + submodules: 'true' + fetch-depth: 0 + - name: Update pip reqs + run : python3 -m pip install --upgrade -r tools/requirements.txt --break-system-packages + - name: Env setup + run: cp BUILD.vars.gha BUILD.vars && echo "/opt/bsc-2022.01/bin" >> "$GITHUB_PATH" + - name: Restore build-dir + run: if [ -d /tmp/cobble_build_bkup ]; then cp -R /tmp/cobble_build_bkup ./build; else mkdir ./build; fi + - name: cobble init + run: ../vnd/cobble/cobble init .. --reinit + working-directory: ./build + - name: Build FPGAs + run: ./cobble build -v "//.*#bitstream" + working-directory: ./build + - name: backup build-dir + run: cp -R ./build /tmp/cobble_build_bkup \ No newline at end of file diff --git a/.github/workflows/simulation.yml b/.github/workflows/simulation.yml index 0fc06c99..e22133d5 100644 --- a/.github/workflows/simulation.yml +++ b/.github/workflows/simulation.yml @@ -55,7 +55,7 @@ jobs: run: ../vnd/cobble/cobble init .. --reinit working-directory: ./build - name: Run BSIM tests - run: ./cobble bluesim_test "//.*SchmittRegTest.*" + run: ./cobble bluesim_test "//.*Test.*" working-directory: ./build - name: backup build-dir run: cp -R ./build /tmp/cobble_build_bkup \ No newline at end of file diff --git a/hdl/ip/vhd/vunit_components/BUCK b/hdl/ip/vhd/vunit_components/BUCK index 892475e5..76c8f1b9 100644 --- a/hdl/ip/vhd/vunit_components/BUCK +++ b/hdl/ip/vhd/vunit_components/BUCK @@ -20,13 +20,6 @@ vhdl_unit( visibility = ['PUBLIC'], ) -vunit_sim( - name = "qspi_vc_tb", - srcs = glob(["qspi_controller/sims/*.vhd"]), - deps = [":qspi_controller_vc"], - visibility = ['PUBLIC'], -) - vhdl_unit( name = "basic_stream", srcs = glob(["basic_stream/*.vhd"]),