Merge branch 'main' into dependabot/github_actions/actions/checkout-5

Author: timkpaine

.github/workflows/build.yml

@@ -30,7 +30,7 @@ permissions:
 jobs:
   initialize:
     runs-on:
-      - ubuntu-22.04
+      - ubuntu-24.04 # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
 
     outputs:
       RELEASE: ${{ steps.setuppush.outputs.RELEASE || steps.setupmanual.outputs.RELEASE }}
@@ -65,7 +65,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-22.04 # https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md
+          - ubuntu-24.04 # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
 
     runs-on: ${{ matrix.os }}
 
@@ -122,10 +122,10 @@ jobs:
           make surelog/install
           make surelog/debian
 
-      - name: Build - simview
-        run: |
-          make simview/install
-          make simview/debian
+      # - name: Build - simview
+      #   run: |
+      #     make simview/install
+      #     make simview/debian
 
       - name: Build - yosys
         run: |
@@ -157,7 +157,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-22.04 # https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md
+          - ubuntu-24.04 # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
 
     runs-on: ${{ matrix.os }}
 
@@ -277,15 +277,15 @@ jobs:
     if: ${{ needs.initialize.outputs.RELEASE == 'true' }}
 
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: artifact-deb
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: artifact-deb-verible
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: artifact-deb-surfer
 

Makefile

@@ -86,6 +86,9 @@ OPENFPGALOADER_VERSION := 0.13.1
 SIMVIEW_VERSION := 0.0.1
 SURFER_VERSION := 0.0.1
 
+# TODO
+VERIBLE_TAG := v0.0-3960-g1f2b094d
+
 #####################################################################################################################################################################################################################################################################################
 RELEASE_VERSION := 0.0.1
 
@@ -96,7 +99,7 @@ download:  ## Download all releases
 	wget https://github.com/dau-dev/tools/releases/download/v$(RELEASE_VERSION)/json_$(JSON_VERSION)_amd64.deb
 	wget https://github.com/dau-dev/tools/releases/download/v$(RELEASE_VERSION)/uhdm_$(UHDM_VERSION)_amd64.deb
 	wget https://github.com/dau-dev/tools/releases/download/v$(RELEASE_VERSION)/surelog_$(SURELOG_VERSION)_amd64.deb
-	wget https://github.com/dau-dev/tools/releases/download/v$(RELEASE_VERSION)/simview_$(SIMVIEW_VERSION)_amd64.deb
+	# wget https://github.com/dau-dev/tools/releases/download/v$(RELEASE_VERSION)/simview_$(SIMVIEW_VERSION)_amd64.deb
 	wget https://github.com/dau-dev/tools/releases/download/v$(RELEASE_VERSION)/yosys_$(YOSYS_VERSION)_amd64.deb
 	wget https://github.com/dau-dev/tools/releases/download/v$(RELEASE_VERSION)/synlig_$(SYNLIG_VERSION)_amd64.deb
 	wget https://github.com/dau-dev/tools/releases/download/v$(RELEASE_VERSION)/verilator_$(VERILATOR_VERSION)_amd64.deb
@@ -368,8 +371,7 @@ surelog/debian:  ## build debian package for surelog
 #
 .PHONY: verible/libs verible verible/install verible/debian
 verible/.git:
-	# git clone --depth 1 --branch v$(VERIBLE_VERSION) https://github.com/chipsalliance/verible.git
-	git clone --depth 1 --branch master https://github.com/chipsalliance/verible.git
+	git clone --depth 1 --branch $(VERIBLE_TAG) https://github.com/chipsalliance/verible.git
 
 verible/libs: verible/.git
 	cd verible && bazel build -c opt //...

README.md

@@ -10,10 +10,12 @@ Software Tools
 | capnproto      | [capnproto/capnproto](https://github.com/capnproto/capnproto)             | 1.0.0              | amd64 | deb      |
 | JSON           | [nlohmann/json](https://github.com/nlohmann/json)                         | 3.11.2             | amd64 | deb      |
 | openFPGALoader | [trabucayre/openFPGALoader](https://github.com/trabucayre/openFPGALoader) | 0.13.1             | amd64 | deb      |
-| simview        | [pieter3d/simview](https://github.com/pieter3d/simview)                   | N/A                | amd64 | deb      |
 | Surelog        | [chipsalliance/surelog](https://github.com/chipsalliance/surelog)         | 1.80               | amd64 | deb      |
 | surfer         | [surfer-project/surfer](https://gitlab.com/surfer-project/surfer)         | N/A                | amd64 | deb      |
 | UHDM           | [chipsalliance/uhdm](https://github.com/chipsalliance/uhdm)               | 1.80               | amd64 | deb      |
 | Verible        | [chipsalliance/verible](https://github.com/chipsalliance/verible)         | 0.0-3430-g060bde0f | amd64 | deb      |
 | verilator      | [verilator/verilator](https://github.com/verilator/verilator)             | 5.034              |       |          |
 | yosys          | [YosysHQ/yosys](https://github.com/YosysHQ/yosys)                         | 0.51               | amd64 | deb      |
+
+
+<!-- | simview        | [pieter3d/simview](https://github.com/pieter3d/simview)                   | N/A                | amd64 | deb      | -->