Skip to content

Commit 94eeea7

Browse files
lefoulefou
authored
Use Mill 0.12.14 with mill-contrib-sonatypecentral plugin for publishing (#221)
We can't yet test with Mill 0.12, but we need Mill 0.12 to run the new mill-contrib-sonatypecentral plugin for publishing. Hence, we just use newer Mill for publishing, but not testing. Updated Mill wrapper scripts to 1.0.0-M1-21-7b6fae-DIRTY892b63e8
1 parent 789876a commit 94eeea7

File tree

3 files changed

+539
-188
lines changed

3 files changed

+539
-188
lines changed

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
- uses: actions/setup-java@v4
5858
with:
59-
java-version: 8
59+
java-version: 11
6060
distribution: temurin
6161

6262
- name: Setup GPG secrets for publish
@@ -66,4 +66,9 @@ jobs:
6666
gpg --list-secret-keys --keyid-format LONG
6767
6868
- name: Publish to Maven Central
69-
run: ./millw -i mill.scalalib.PublishModule/publishAll --sonatypeCreds "${{ secrets.SONATYPE_CREDS }}" --gpgArgs "--passphrase=${{ secrets.GPG_SECRET_KEY_PASS }},--batch,--yes,-a,-b,--pinentry-mode,loopback" --publishArtifacts __.publishArtifacts --readTimeout 600000 --awaitTimeout 600000 --release true --signed true
69+
run: MILL_VERSION="0.12.14" ./millw -i --import "ivy:com.lihaoyi::mill-contrib-sonatypecentral:" mill.contrib.sonatypecentral.SonatypeCentralPublishModule/publishAll --publishArtifacts __.publishArtifacts
70+
env:
71+
MILL_PGP_PASSPHRASE: ${{ secrets.GPG_SECRET_KEY_PASS }}
72+
# MILL_PGP_SECRET_BASE64: ${{ secrets.GPG_SECRET_KEY }}
73+
MILL_SONATYPE_PASSWORD: ${{ secrets.MILL_SONATYPE_PASSWORD }}
74+
MILL_SONATYPE_USERNAME: ${{ secrets.MILL_SONATYPE_USERNAME }}

‎millw‎

Lines changed: 233 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,52 @@
11
#!/usr/bin/env sh
22

3-
# This is a wrapper script, that automatically download mill from GitHub release pages
4-
# You can give the required mill version with --mill-version parameter
5-
# If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
3+
# This is a wrapper script, that automatically selects or downloads Mill from Maven Central or GitHub release pages.
64
#
7-
# Project page: https://github.com/lefou/millw
8-
# Script Version: 0.4.2
5+
# This script determines the Mill version to use by trying these sources
6+
# - env-variable `MILL_VERSION`
7+
# - local file `.mill-version`
8+
# - local file `.config/mill-version`
9+
# - `mill-version` from YAML fronmatter of current buildfile
10+
# - if accessible, find the latest stable version available on Maven Central (https://repo1.maven.org/maven2)
11+
# - env-variable `DEFAULT_MILL_VERSION`
12+
#
13+
# If a version has the suffix '-native' a native binary will be used.
14+
# If a version has the suffix '-jvm' an executable jar file will be used, requiring an already installed Java runtime.
15+
# If no such suffix is found, the script will pick a default based on version and platform.
16+
#
17+
# Once a version was determined, it tries to use either
18+
# - a system-installed mill, if found and it's version matches
19+
# - an already downloaded version under ~/.cache/mill/download
20+
#
21+
# If no working mill version was found on the system,
22+
# this script downloads a binary file from Maven Central or Github Pages (this is version dependent)
23+
# into a cache location (~/.cache/mill/download).
24+
#
25+
# Mill Project URL: https://github.com/com-lihaoyi/mill
26+
# Script Version: 1.0.0-M1-21-7b6fae-DIRTY892b63e8
927
#
1028
# If you want to improve this script, please also contribute your changes back!
29+
# This script was generated from: dist/scripts/src/mill.sh
1130
#
1231
# Licensed under the Apache License, Version 2.0
1332

33+
set -e
34+
35+
if [ "$1" = "--setup-completions" ] ; then
36+
# Need to preserve the first position of those listed options
37+
MILL_FIRST_ARG=$1
38+
shift
39+
fi
40+
41+
if [ -z "${DEFAULT_MILL_VERSION}" ] ; then
42+
DEFAULT_MILL_VERSION="0.12.10"
43+
fi
1444

15-
DEFAULT_MILL_VERSION=0.10.0
1645

17-
set -e
46+
if [ -z "${GITHUB_RELEASE_CDN}" ] ; then
47+
GITHUB_RELEASE_CDN=""
48+
fi
49+
1850

1951
MILL_REPO_URL="https://github.com/com-lihaoyi/mill"
2052

@@ -24,16 +56,17 @@ fi
2456

2557
# Explicit commandline argument takes precedence over all other methods
2658
if [ "$1" = "--mill-version" ] ; then
27-
shift
28-
if [ "x$1" != "x" ] ; then
29-
MILL_VERSION="$1"
30-
shift
31-
else
32-
echo "You specified --mill-version without a version." 1>&2
33-
echo "Please provide a version that matches one provided on" 1>&2
34-
echo "${MILL_REPO_URL}/releases" 1>&2
35-
false
36-
fi
59+
echo "The --mill-version option is no longer supported." 1>&2
60+
fi
61+
62+
MILL_BUILD_SCRIPT=""
63+
64+
if [ -f "build.mill" ] ; then
65+
MILL_BUILD_SCRIPT="build.mill"
66+
elif [ -f "build.mill.scala" ] ; then
67+
MILL_BUILD_SCRIPT="build.mill.scala"
68+
elif [ -f "build.sc" ] ; then
69+
MILL_BUILD_SCRIPT="build.sc"
3770
fi
3871

3972
# Please note, that if a MILL_VERSION is already set in the environment,
@@ -42,21 +75,25 @@ fi
4275
# If not already set, read .mill-version file
4376
if [ -z "${MILL_VERSION}" ] ; then
4477
if [ -f ".mill-version" ] ; then
45-
MILL_VERSION="$(head -n 1 .mill-version 2> /dev/null)"
78+
MILL_VERSION="$(tr '\r' '\n' < .mill-version | head -n 1 2> /dev/null)"
79+
elif [ -f ".config/mill-version" ] ; then
80+
MILL_VERSION="$(tr '\r' '\n' < .config/mill-version | head -n 1 2> /dev/null)"
81+
elif [ -n "${MILL_BUILD_SCRIPT}" ] ; then
82+
MILL_VERSION="$(cat ${MILL_BUILD_SCRIPT} | grep '//[|] *mill-version: *' | sed 's;//| *mill-version: *;;')"
4683
fi
4784
fi
4885

49-
if [ -n "${XDG_CACHE_HOME}" ] ; then
50-
MILL_DOWNLOAD_PATH="${XDG_CACHE_HOME}/mill/download"
51-
else
52-
MILL_DOWNLOAD_PATH="${HOME}/.cache/mill/download"
86+
MILL_USER_CACHE_DIR="${XDG_CACHE_HOME:-${HOME}/.cache}/mill"
87+
88+
if [ -z "${MILL_DOWNLOAD_PATH}" ] ; then
89+
MILL_DOWNLOAD_PATH="${MILL_USER_CACHE_DIR}/download"
5390
fi
5491

5592
# If not already set, try to fetch newest from Github
5693
if [ -z "${MILL_VERSION}" ] ; then
5794
# TODO: try to load latest version from release page
5895
echo "No mill version specified." 1>&2
59-
echo "You should provide a version via '.mill-version' file or --mill-version option." 1>&2
96+
echo "You should provide a version via a '//| mill-version: ' comment or a '.mill-version' file." 1>&2
6097

6198
mkdir -p "${MILL_DOWNLOAD_PATH}"
6299
LANG=C touch -d '1 hour ago' "${MILL_DOWNLOAD_PATH}/.expire_latest" 2>/dev/null || (
@@ -92,80 +129,205 @@ if [ -z "${MILL_VERSION}" ] ; then
92129
fi
93130
fi
94131

95-
MILL="${MILL_DOWNLOAD_PATH}/${MILL_VERSION}"
132+
MILL_NATIVE_SUFFIX="-native"
133+
MILL_JVM_SUFFIX="-jvm"
134+
FULL_MILL_VERSION=$MILL_VERSION
135+
ARTIFACT_SUFFIX=""
136+
set_artifact_suffix(){
137+
if [ "$(expr substr $(uname -s) 1 5 2>/dev/null)" = "Linux" ]; then
138+
if [ "$(uname -m)" = "aarch64" ]; then
139+
ARTIFACT_SUFFIX="-native-linux-aarch64"
140+
else
141+
ARTIFACT_SUFFIX="-native-linux-amd64"
142+
fi
143+
elif [ "$(uname)" = "Darwin" ]; then
144+
if [ "$(uname -m)" = "arm64" ]; then
145+
ARTIFACT_SUFFIX="-native-mac-aarch64"
146+
else
147+
ARTIFACT_SUFFIX="-native-mac-amd64"
148+
fi
149+
else
150+
echo "This native mill launcher supports only Linux and macOS." 1>&2
151+
exit 1
152+
fi
153+
}
154+
155+
case "$MILL_VERSION" in
156+
*"$MILL_NATIVE_SUFFIX")
157+
MILL_VERSION=${MILL_VERSION%"$MILL_NATIVE_SUFFIX"}
158+
set_artifact_suffix
159+
;;
160+
161+
*"$MILL_JVM_SUFFIX")
162+
MILL_VERSION=${MILL_VERSION%"$MILL_JVM_SUFFIX"}
163+
;;
164+
165+
*)
166+
case "$MILL_VERSION" in
167+
0.1.*) ;;
168+
0.2.*) ;;
169+
0.3.*) ;;
170+
0.4.*) ;;
171+
0.5.*) ;;
172+
0.6.*) ;;
173+
0.7.*) ;;
174+
0.8.*) ;;
175+
0.9.*) ;;
176+
0.10.*) ;;
177+
0.11.*) ;;
178+
0.12.*) ;;
179+
*)
180+
set_artifact_suffix
181+
esac
182+
;;
183+
esac
184+
185+
MILL="${MILL_DOWNLOAD_PATH}/$MILL_VERSION$ARTIFACT_SUFFIX"
96186

97187
try_to_use_system_mill() {
188+
if [ "$(uname)" != "Linux" ]; then
189+
return 0
190+
fi
191+
98192
MILL_IN_PATH="$(command -v mill || true)"
99193

100194
if [ -z "${MILL_IN_PATH}" ]; then
101-
return
195+
return 0
102196
fi
103197

104-
UNIVERSAL_SCRIPT_MAGIC="@ 2>/dev/null # 2>nul & echo off & goto BOF"
198+
SYSTEM_MILL_FIRST_TWO_BYTES=$(head --bytes=2 "${MILL_IN_PATH}")
199+
if [ "${SYSTEM_MILL_FIRST_TWO_BYTES}" = "#!" ]; then
200+
# MILL_IN_PATH is (very likely) a shell script and not the mill
201+
# executable, ignore it.
202+
return 0
203+
fi
105204

106-
if ! head -c 128 "${MILL_IN_PATH}" | grep -qF "${UNIVERSAL_SCRIPT_MAGIC}"; then
107-
if [ -n "${MILLW_VERBOSE}" ]; then
108-
echo "Could not determine mill version of ${MILL_IN_PATH}, as it does not start with the universal script magic2" 1>&2
109-
fi
110-
return
205+
SYSTEM_MILL_PATH=$(readlink -e "${MILL_IN_PATH}")
206+
SYSTEM_MILL_SIZE=$(stat --format=%s "${SYSTEM_MILL_PATH}")
207+
SYSTEM_MILL_MTIME=$(stat --format=%y "${SYSTEM_MILL_PATH}")
208+
209+
if [ ! -d "${MILL_USER_CACHE_DIR}" ]; then
210+
mkdir -p "${MILL_USER_CACHE_DIR}"
111211
fi
112212

113-
# Roughly the size of the universal script.
114-
MILL_VERSION_SEARCH_RANGE="2403"
115-
MILL_IN_PATH_VERSION=$(head -c "${MILL_VERSION_SEARCH_RANGE}" "${MILL_IN_PATH}" |\
116-
sed -n 's/^.*-DMILL_VERSION=\([^\s]*\) .*$/\1/p' |\
117-
head -n 1)
213+
SYSTEM_MILL_INFO_FILE="${MILL_USER_CACHE_DIR}/system-mill-info"
214+
if [ -f "${SYSTEM_MILL_INFO_FILE}" ]; then
215+
parseSystemMillInfo() {
216+
LINE_NUMBER="${1}"
217+
# Select the line number of the SYSTEM_MILL_INFO_FILE, cut the
218+
# variable definition in that line in two halves and return
219+
# the value, and finally remove the quotes.
220+
sed -n "${LINE_NUMBER}p" "${SYSTEM_MILL_INFO_FILE}" |\
221+
cut -d= -f2 |\
222+
sed 's/"\(.*\)"/\1/'
223+
}
224+
225+
CACHED_SYSTEM_MILL_PATH=$(parseSystemMillInfo 1)
226+
CACHED_SYSTEM_MILL_VERSION=$(parseSystemMillInfo 2)
227+
CACHED_SYSTEM_MILL_SIZE=$(parseSystemMillInfo 3)
228+
CACHED_SYSTEM_MILL_MTIME=$(parseSystemMillInfo 4)
118229

119-
if [ -z "${MILL_IN_PATH_VERSION}" ]; then
120-
echo "Could not determine mill version, even though ${MILL_IN_PATH} has the universal script magic" 1>&2
121-
return
230+
if [ "${SYSTEM_MILL_PATH}" = "${CACHED_SYSTEM_MILL_PATH}" ] \
231+
&& [ "${SYSTEM_MILL_SIZE}" = "${CACHED_SYSTEM_MILL_SIZE}" ] \
232+
&& [ "${SYSTEM_MILL_MTIME}" = "${CACHED_SYSTEM_MILL_MTIME}" ]; then
233+
if [ "${CACHED_SYSTEM_MILL_VERSION}" = "${MILL_VERSION}" ]; then
234+
MILL="${SYSTEM_MILL_PATH}"
235+
return 0
236+
else
237+
return 0
238+
fi
239+
fi
122240
fi
123241

124-
if [ "${MILL_IN_PATH_VERSION}" = "${MILL_VERSION}" ]; then
125-
MILL="${MILL_IN_PATH}"
242+
SYSTEM_MILL_VERSION=$(${SYSTEM_MILL_PATH} --version | head -n1 | sed -n 's/^Mill.*version \(.*\)/\1/p')
243+
244+
cat <<EOF > "${SYSTEM_MILL_INFO_FILE}"
245+
CACHED_SYSTEM_MILL_PATH="${SYSTEM_MILL_PATH}"
246+
CACHED_SYSTEM_MILL_VERSION="${SYSTEM_MILL_VERSION}"
247+
CACHED_SYSTEM_MILL_SIZE="${SYSTEM_MILL_SIZE}"
248+
CACHED_SYSTEM_MILL_MTIME="${SYSTEM_MILL_MTIME}"
249+
EOF
250+
251+
if [ "${SYSTEM_MILL_VERSION}" = "${MILL_VERSION}" ]; then
252+
MILL="${SYSTEM_MILL_PATH}"
126253
fi
127254
}
128255
try_to_use_system_mill
129256

130257
# If not already downloaded, download it
131-
if [ ! -s "${MILL}" ] ; then
258+
if [ ! -s "${MILL}" ] || [ "$MILL_TEST_DRY_RUN_LAUNCHER_SCRIPT" = "1" ] ; then
259+
case $MILL_VERSION in
260+
0.0.* | 0.1.* | 0.2.* | 0.3.* | 0.4.* )
261+
DOWNLOAD_SUFFIX=""
262+
DOWNLOAD_FROM_MAVEN=0
263+
;;
264+
0.5.* | 0.6.* | 0.7.* | 0.8.* | 0.9.* | 0.10.* | 0.11.0-M* )
265+
DOWNLOAD_SUFFIX="-assembly"
266+
DOWNLOAD_FROM_MAVEN=0
267+
;;
268+
*)
269+
DOWNLOAD_SUFFIX="-assembly"
270+
DOWNLOAD_FROM_MAVEN=1
271+
;;
272+
esac
273+
case $MILL_VERSION in
274+
0.12.0 | 0.12.1 | 0.12.2 | 0.12.3 | 0.12.4 | 0.12.5 | 0.12.6 | 0.12.7 | 0.12.8 | 0.12.9 | 0.12.10 | 0.12.11 )
275+
DOWNLOAD_EXT="jar"
276+
;;
277+
0.12.* )
278+
DOWNLOAD_EXT="exe"
279+
;;
280+
0.* )
281+
DOWNLOAD_EXT="jar"
282+
;;
283+
*)
284+
DOWNLOAD_EXT="exe"
285+
;;
286+
esac
132287

133-
# support old non-XDG download dir
134-
MILL_OLD_DOWNLOAD_PATH="${HOME}/.mill/download"
135-
OLD_MILL="${MILL_OLD_DOWNLOAD_PATH}/${MILL_VERSION}"
136-
if [ -x "${OLD_MILL}" ] ; then
137-
MILL="${OLD_MILL}"
288+
DOWNLOAD_FILE=$(mktemp mill.XXXXXX)
289+
if [ "$DOWNLOAD_FROM_MAVEN" = "1" ] ; then
290+
DOWNLOAD_URL="https://repo1.maven.org/maven2/com/lihaoyi/mill-dist${ARTIFACT_SUFFIX}/${MILL_VERSION}/mill-dist${ARTIFACT_SUFFIX}-${MILL_VERSION}.${DOWNLOAD_EXT}"
138291
else
139-
VERSION_PREFIX="$(echo $MILL_VERSION | cut -b -4)"
140-
case $VERSION_PREFIX in
141-
0.0. | 0.1. | 0.2. | 0.3. | 0.4. )
142-
DOWNLOAD_SUFFIX=""
143-
;;
144-
*)
145-
DOWNLOAD_SUFFIX="-assembly"
146-
;;
147-
esac
148-
unset VERSION_PREFIX
149-
150-
DOWNLOAD_FILE=$(mktemp mill.XXXXXX)
151-
# TODO: handle command not found
152-
echo "Downloading mill ${MILL_VERSION} from ${MILL_REPO_URL}/releases ..." 1>&2
153-
MILL_VERSION_TAG=$(echo $MILL_VERSION | sed -E 's/([^-]+)(-M[0-9]+)?(-.*)?/\1\2/')
154-
${CURL_CMD} -f -L -o "${DOWNLOAD_FILE}" "${MILL_REPO_URL}/releases/download/${MILL_VERSION_TAG}/${MILL_VERSION}${DOWNLOAD_SUFFIX}"
155-
chmod +x "${DOWNLOAD_FILE}"
156-
mkdir -p "${MILL_DOWNLOAD_PATH}"
157-
mv "${DOWNLOAD_FILE}" "${MILL}"
158-
159-
unset DOWNLOAD_FILE
160-
unset DOWNLOAD_SUFFIX
292+
MILL_VERSION_TAG=$(echo "$MILL_VERSION" | sed -E 's/([^-]+)(-M[0-9]+)?(-.*)?/\1\2/')
293+
DOWNLOAD_URL="${GITHUB_RELEASE_CDN}${MILL_REPO_URL}/releases/download/${MILL_VERSION_TAG}/${MILL_VERSION}${DOWNLOAD_SUFFIX}"
294+
unset MILL_VERSION_TAG
295+
fi
296+
297+
if [ "$MILL_TEST_DRY_RUN_LAUNCHER_SCRIPT" = "1" ] ; then
298+
echo $DOWNLOAD_URL
299+
echo $MILL
300+
exit 0
161301
fi
302+
# TODO: handle command not found
303+
echo "Downloading mill ${MILL_VERSION} from ${DOWNLOAD_URL} ..." 1>&2
304+
${CURL_CMD} -f -L -o "${DOWNLOAD_FILE}" "${DOWNLOAD_URL}"
305+
chmod +x "${DOWNLOAD_FILE}"
306+
mkdir -p "${MILL_DOWNLOAD_PATH}"
307+
mv "${DOWNLOAD_FILE}" "${MILL}"
308+
309+
unset DOWNLOAD_FILE
310+
unset DOWNLOAD_SUFFIX
311+
fi
312+
313+
if [ -z "$MILL_MAIN_CLI" ] ; then
314+
MILL_MAIN_CLI="${0}"
315+
fi
316+
317+
MILL_FIRST_ARG=""
318+
if [ "$1" = "--bsp" ] || [ "${1#"-i"}" != "$1" ] || [ "$1" = "--interactive" ] || [ "$1" = "--no-server" ] || [ "$1" = "--no-daemon" ] || [ "$1" = "--repl" ] || [ "$1" = "--help" ] ; then
319+
# Need to preserve the first position of those listed options
320+
MILL_FIRST_ARG=$1
321+
shift
162322
fi
163323

164324
unset MILL_DOWNLOAD_PATH
165325
unset MILL_OLD_DOWNLOAD_PATH
166326
unset OLD_MILL
167327
unset MILL_VERSION
168-
unset MILL_VERSION_TAG
169328
unset MILL_REPO_URL
170329

171-
exec "${MILL}" "$@"
330+
# -D mill.main.cli is for compatibility with Mill 0.10.9 - 0.13.0-M2
331+
# We don't quote MILL_FIRST_ARG on purpose, so we can expand the empty value without quotes
332+
# shellcheck disable=SC2086
333+
exec "${MILL}" $MILL_FIRST_ARG -D "mill.main.cli=${MILL_MAIN_CLI}" "$@"

0 commit comments

Comments
 (0)