From 51cd29f905fd7fde1a5f6f2fe123fe2c77ee380a Mon Sep 17 00:00:00 2001 From: Avimitin Date: Thu, 6 Feb 2025 19:42:28 +0800 Subject: [PATCH 1/2] [mill] fix empty jar package --- build.mill | 4 ++-- flake.lock | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.mill b/build.mill index 5866def..785d310 100644 --- a/build.mill +++ b/build.mill @@ -36,7 +36,7 @@ trait Arithmetic override def scalaVersion = T(v.scala) - override def millSourcePath = os.pwd / "arithmetic" + def sourceRoots = Task.Sources(millSourcePath / "arithmetic") def spireIvy = v.spire @@ -70,7 +70,7 @@ trait Elaborator extends Cross.Module[String] { object elaborate extends ScalaModule with ScalafmtModule{ - override def millSourcePath: os.Path = os.pwd / "elaborator" + def sourceRoots = Task.Sources(millSourcePath / "elaborator") override def scalaVersion = v.scala diff --git a/flake.lock b/flake.lock index 19bd8d0..cf9db7b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "chisel-nix": { "locked": { - "lastModified": 1737828683, - "narHash": "sha256-SOwU0QmgV3DScCzdtt2cxqr0ac2Um0oQO7SOJ4LMyds=", + "lastModified": 1738833761, + "narHash": "sha256-Nd4dg0yqE6bTsYosIriY5bwA131ElmpL4hEiwhai0L0=", "owner": "chipsalliance", "repo": "chisel-nix", - "rev": "46999288edc2a302edfe95eebde61d3e66e5c037", + "rev": "c017137726f38715ad31eb43e8254f7f43f46fdc", "type": "github" }, "original": { From 806f8b82287fd61ea8340eee7d86fb0ac2b285d8 Mon Sep 17 00:00:00 2001 From: Avimitin Date: Fri, 7 Feb 2025 14:25:40 +0800 Subject: [PATCH 2/2] [ci] update arithmetic compile check CI --- .github/workflows/push.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 51ea5dd..3e0e265 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - chisel: ["5.0.0"] + chisel: ["snapshot"] steps: - uses: actions/checkout@v2 @@ -16,8 +16,8 @@ jobs: submodules: 'true' - uses: cachix/install-nix-action@v19 with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install + install_url: https://releases.nixos.org/nix/nix-2.26.1/install nix_path: nixpkgs=channel:nixos-unstable - name: run test run: | - nix --experimental-features 'nix-command flakes' develop -c mill -j 0 'arithmetic[${{ matrix.chisel }}].compile' + nix --experimental-features 'nix-command flakes' build '.#arithmetic'