Skip to content

Commit 7fbc2a1

Browse files
authored
Merge pull request #23 from Readon/master
update mill to 1.1.0
2 parents b19ad07 + c6836bc commit 7fbc2a1

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- master
77
tags:
88
- '*'
9-
pull_request:
9+
pull_request:
1010

1111
env:
1212
REGISTRY: ghcr.io

Dockerfile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,16 @@ FROM base AS build-spinal
114114
# | tee /etc/apt/sources.list.d/sbt_old.list \
115115
# && apt update && apt install sbt
116116

117-
ARG MILL_VERSION="0.10.9"
117+
ARG MILL_VERSION="1.1.0"
118118
RUN \
119-
curl -L -o /usr/local/bin/mill https://github.com/lihaoyi/mill/releases/download/$MILL_VERSION/$MILL_VERSION && \
119+
curl -L -o /usr/local/bin/mill https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/$MILL_VERSION/mill-dist-$MILL_VERSION-mill.sh && \
120120
chmod +x /usr/local/bin/mill && \
121-
touch build.sc && \
122-
mill -i resolve _ && \
123-
rm build.sc
121+
mkdir -p /tmp/mill-build && \
122+
cd /tmp/mill-build && \
123+
touch build.sc && \
124+
mill -i resolve _ && \
125+
cd / && \
126+
rm -rf /tmp/mill-build
124127

125128
FROM base AS run
126129

@@ -142,4 +145,4 @@ COPY --from=build-symbiyosys /opt /opt
142145
COPY --from=build-verilator /opt /opt
143146
COPY --from=build-spinal /opt /opt
144147
COPY --from=build-spinal /usr/local/bin/mill /opt/bin/mill
145-
# COPY --from=build-spinal /sbt /sbt
148+
# COPY --from=build-spinal /sbt /sbt

0 commit comments

Comments
 (0)