From 0e8f40e171cdae48bd71e47f70306b1deed05bd2 Mon Sep 17 00:00:00 2001 From: dopamane Date: Sat, 10 Aug 2024 09:31:31 +0200 Subject: [PATCH 1/6] Update CI Install `bx` and test each demo is synthesizable --- .github/workflows/haskell.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index a1b0ae2..d843800 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -100,3 +100,13 @@ jobs: - name: test run: cabal run test -- --no-create + + - name: demo + run: | + cabal install + bx --FiatLux -s + bx --RgbCounter -s + bx --RgbCycle -s + bx --Hello -s + bx --Echo -s + bx --LedCtrl -s From 0bacd8d249d34f65eea1099d0d845ef215fbc6c0 Mon Sep 17 00:00:00 2001 From: dopamane Date: Sat, 10 Aug 2024 09:33:45 +0200 Subject: [PATCH 2/6] Add `SpramReverse` --- .github/workflows/haskell.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index d843800..f4ced6d 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -104,9 +104,10 @@ jobs: - name: demo run: | cabal install - bx --FiatLux -s - bx --RgbCounter -s - bx --RgbCycle -s - bx --Hello -s - bx --Echo -s - bx --LedCtrl -s + bx --FiatLux -s + bx --RgbCounter -s + bx --RgbCycle -s + bx --Hello -s + bx --Echo -s + bx --LedCtrl -s + bx --SpramReverse -s From 63fb9ba8798dfc954c4cbafeb96db6e72b7898a7 Mon Sep 17 00:00:00 2001 From: dopamane Date: Sat, 10 Aug 2024 11:14:29 +0200 Subject: [PATCH 3/6] Constrain async --- bayeux.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bayeux.cabal b/bayeux.cabal index 2e5da3d..435a147 100644 --- a/bayeux.cabal +++ b/bayeux.cabal @@ -34,7 +34,7 @@ library other-modules: Paths_bayeux autogen-modules: Paths_bayeux build-depends: array - , async + , async >= 2.0 , base , bytestring , containers From 89fdb3639214cea3f930d2f14ebf0d340ddcd5f8 Mon Sep 17 00:00:00 2001 From: dopamane Date: Sat, 10 Aug 2024 11:20:01 +0200 Subject: [PATCH 4/6] Update package description --- bayeux.cabal | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bayeux.cabal b/bayeux.cabal index 435a147..b924060 100644 --- a/bayeux.cabal +++ b/bayeux.cabal @@ -1,17 +1,21 @@ cabal-version: 3.0 name: bayeux version: 0.1.0.0 -homepage: https://github.com/dopamane/bayeux +homepage: https://github.com/standardsemiconductor/bayeux license: MIT license-file: LICENSE author: dopamane -maintainer: dwc1295@gmail.com +maintainer: standardsemiconductor@gmail.com copyright: David Cox category: Language build-type: Simple extra-doc-files: CHANGELOG.md data-files: data/**/*.pcf +source-repository head + type: git + location: https://github.com/standardsemiconductor/yosys-rtl + library ghc-options: -Wall exposed-modules: Bayeux From 818cd6ba737be9e7b0b195a0e312fa3dc6df8bb2 Mon Sep 17 00:00:00 2001 From: dopamane Date: Sat, 10 Aug 2024 13:28:57 +0200 Subject: [PATCH 5/6] Add nextpnr --- .github/workflows/haskell.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index f4ced6d..1aa87b9 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -78,6 +78,21 @@ jobs: repository: YosysHQ/icestorm path: icestorm + - name: checkout nextpnr + uses: actions/checkout@v4 + with: + repository: YosysHQ/nextpnr + ref: master + path: nextpnr + submodules: true + + - name: install nextpnr + working-directory: nextpnr + run: | + cmake -DARCH=ice40 -DCMAKE_INSTALL_PREFIX=/usr/local . + make + sudo make install + - name: install icestorm working-directory: icestorm run: | From 20284f95d468d2306991d11ad5e89423c09e2724 Mon Sep 17 00:00:00 2001 From: dopamane Date: Sat, 10 Aug 2024 13:33:30 +0200 Subject: [PATCH 6/6] Fixup --- .github/workflows/haskell.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 1aa87b9..e5e9e53 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -78,6 +78,12 @@ jobs: repository: YosysHQ/icestorm path: icestorm + - name: install icestorm + working-directory: icestorm + run: | + make + sudo make install + - name: checkout nextpnr uses: actions/checkout@v4 with: @@ -93,12 +99,6 @@ jobs: make sudo make install - - name: install icestorm - working-directory: icestorm - run: | - make - sudo make install - - name: checkout yosys uses: actions/checkout@v4 with: