Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master
tags:
- '*'
pull_request:
pull_request:

env:
REGISTRY: ghcr.io
Expand Down
15 changes: 9 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
# COPY --from=build-spinal /sbt /sbt
Loading