File tree 3 files changed +7
-6
lines changed
requests/test/src/requests
3 files changed +7
-6
lines changed Original file line number Diff line number Diff line change 1
- 0.11.11
2
-
1
+ 0.12.0
Original file line number Diff line number Diff line change 7
7
set -e
8
8
9
9
if [ -z " ${DEFAULT_MILL_VERSION} " ] ; then
10
- DEFAULT_MILL_VERSION=0.11.5
10
+ DEFAULT_MILL_VERSION=0.11.12
11
11
fi
12
12
13
13
if [ -z " $MILL_VERSION " ] ; then
@@ -40,7 +40,7 @@ if [ ! -s "$MILL_EXEC_PATH" ] ; then
40
40
fi
41
41
DOWNLOAD_FILE=$MILL_EXEC_PATH -tmp-download
42
42
MILL_VERSION_TAG=$( echo $MILL_VERSION | sed -E ' s/([^-]+)(-M[0-9]+)?(-.*)?/\1\2/' )
43
- MILL_DOWNLOAD_URL=" https://github. com/lihaoyi/mill/releases/download/ ${MILL_VERSION_TAG} / $MILL_VERSION ${ASSEMBLY} "
43
+ MILL_DOWNLOAD_URL=" https://repo1.maven.org/maven2/ com/lihaoyi/mill-dist/ $MILL_VERSION /mill-dist- $MILL_VERSION .jar "
44
44
curl --fail -L -o " $DOWNLOAD_FILE " " $MILL_DOWNLOAD_URL "
45
45
chmod +x " $DOWNLOAD_FILE "
46
46
mv " $DOWNLOAD_FILE " " $MILL_EXEC_PATH "
@@ -53,7 +53,9 @@ if [ -z "$MILL_MAIN_CLI" ] ; then
53
53
fi
54
54
55
55
MILL_FIRST_ARG=" "
56
- if [ " $1 " = " --bsp" ] || [ " $1 " = " -i" ] || [ " $1 " = " --interactive" ] || [ " $1 " = " --no-server" ] || [ " $1 " = " --repl" ] || [ " $1 " = " --help" ] ; then
56
+
57
+ # first arg is a long flag for "--interactive" or starts with "-i"
58
+ if [ " $1 " = " --bsp" ] || [ " ${1# " -i" } " != " $1 " ] || [ " $1 " = " --interactive" ] || [ " $1 " = " --no-server" ] || [ " $1 " = " --repl" ] || [ " $1 " = " --help" ] ; then
57
59
# Need to preserve the first position of those listed options
58
60
MILL_FIRST_ARG=$1
59
61
shift
Original file line number Diff line number Diff line change @@ -222,7 +222,7 @@ object RequestTests extends HttpbinTestSuite {
222
222
}
223
223
224
224
test(" clientCertificate" ){
225
- val base = " ./requests/test/resources "
225
+ val base = sys.env( " MILL_TEST_RESOURCE_DIR " )
226
226
val url = " https://client.badssl.com"
227
227
val instruction = " https://github.com/lihaoyi/requests-scala/blob/master/requests/test/resources/badssl.com-client.md"
228
228
val certificateExpiredMessage = s " WARNING: Certificate may have expired and needs to be updated. Please check: $instruction and/or file issue "
You can’t perform that action at this time.
0 commit comments