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 diff --git a/Dockerfile b/Dockerfile index 63429a2..17192ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -114,13 +114,16 @@ 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 _ && \ - 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 @@ -142,4 +145,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