From 1b72a32ed9a28b54eabd2f04436da6dcc6aef07e Mon Sep 17 00:00:00 2001 From: Readon Date: Sun, 1 Mar 2026 01:02:22 +0800 Subject: [PATCH 1/3] Update MILL_VERSION to 1.1.0 in Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 63429a2..eaef775 100644 --- a/Dockerfile +++ b/Dockerfile @@ -114,9 +114,9 @@ FROM base AS build-spinal # | tee /etc/apt/sources.list.d/sbt_old.list \ # && apt update && apt install sbt -ARG MILL_VERSION="0.10.9" +ARG MILL_VERSION="1.1.0" RUN \ - curl -L -o /usr/local/bin/mill https://github.com/lihaoyi/mill/releases/download/$MILL_VERSION/$MILL_VERSION && \ + curl -L -o /usr/local/bin/mill https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/$MILL_VERSION/mill-dist-$MILL_VERSION-mill.sh && \ chmod +x /usr/local/bin/mill && \ touch build.sc && \ mill -i resolve _ && \ @@ -142,4 +142,4 @@ COPY --from=build-symbiyosys /opt /opt COPY --from=build-verilator /opt /opt COPY --from=build-spinal /opt /opt COPY --from=build-spinal /usr/local/bin/mill /opt/bin/mill -# COPY --from=build-spinal /sbt /sbt \ No newline at end of file +# COPY --from=build-spinal /sbt /sbt From e2b0d013a3b92ae01c6e4b61f8d6ac68b4a8f8d3 Mon Sep 17 00:00:00 2001 From: Yindong Xiao Date: Sun, 1 Mar 2026 01:17:24 +0800 Subject: [PATCH 2/3] fix alignment of pull request. --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 5d7a021..a146474 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -6,7 +6,7 @@ on: - master tags: - '*' - pull_request: + pull_request: env: REGISTRY: ghcr.io From c6836bcb66c9c63969bbb4fb3b05ed6c6a3d6cea Mon Sep 17 00:00:00 2001 From: Yindong Xiao Date: Sun, 1 Mar 2026 01:30:05 +0800 Subject: [PATCH 3/3] switch to tmp dir to prepare mill. --- Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index eaef775..17192ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -118,9 +118,12 @@ ARG MILL_VERSION="1.1.0" RUN \ curl -L -o /usr/local/bin/mill https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/$MILL_VERSION/mill-dist-$MILL_VERSION-mill.sh && \ chmod +x /usr/local/bin/mill && \ - touch build.sc && \ - mill -i resolve _ && \ - rm build.sc + mkdir -p /tmp/mill-build && \ + cd /tmp/mill-build && \ + touch build.sc && \ + mill -i resolve _ && \ + cd / && \ + rm -rf /tmp/mill-build FROM base AS run