@@ -176,8 +176,7 @@ install_dependencies() {
176
176
local defaultYarnVersion=$3
177
177
local defaultPHPVersion=$4
178
178
local installGoVersion=$5
179
- local defaultSwiftVersion=$6
180
- local defaultPythonVersion=$7
179
+ local defaultPythonVersion=$6
181
180
182
181
# Python Version
183
182
if [ -f runtime.txt ]
@@ -408,26 +407,34 @@ install_dependencies() {
408
407
fi
409
408
410
409
# Swift Version
411
- : ${SWIFT_VERSION= " $defaultSwiftVersion " }
410
+ defaultSwiftVersion= " 5.2 "
412
411
if [ -f .swift-version ]
413
412
then
414
413
SWIFT_VERSION=$( cat .swift-version)
415
414
echo " Attempting Swift version '$SWIFT_VERSION ' from .swift-version"
416
415
fi
417
416
418
- if [ -d $NETLIFY_CACHE_DIR /swift_version/$SWIFT_VERSION ]
417
+ # If Package.swift is present and no Swift version is set, use a default
418
+ if [ -f Package.swift ]
419
419
then
420
- echo " Started restoring cached Swift version"
421
- rm -rf $SWIFTENV_ROOT /versions/$SWIFT_VERSION
422
- cp -p -r $NETLIFY_CACHE_DIR /swift_version/${SWIFT_VERSION} $SWIFTENV_ROOT /versions/
423
- swiftenv rehash
424
- echo " Finished restoring cached Swift version"
420
+ : ${SWIFT_VERSION=" $defaultSwiftVersion " }
425
421
fi
426
422
427
- # swiftenv expects the following environment variables to refer to
428
- # swiftenv internals
429
- if [ -f .swift-version ] || [ -f Package.swift ]
423
+ if [ -n " $SWIFT_VERSION " ]
430
424
then
425
+ export SWIFT_VERSION=$SWIFT_VERSION
426
+
427
+ if [ -n " $SWIFT_VERSION " ] && [ -d $NETLIFY_CACHE_DIR /swift_version/$SWIFT_VERSION ]
428
+ then
429
+ echo " Started restoring cached Swift version"
430
+ rm -rf $SWIFTENV_ROOT /versions/$SWIFT_VERSION
431
+ cp -p -r $NETLIFY_CACHE_DIR /swift_version/${SWIFT_VERSION} $SWIFTENV_ROOT /versions/
432
+ swiftenv rehash
433
+ echo " Finished restoring cached Swift version"
434
+ fi
435
+
436
+ # swiftenv expects the following environment variables to refer to
437
+ # swiftenv internals
431
438
if PLATFORM=' ' URL=' ' VERSION=' ' swiftenv install -s $SWIFT_VERSION
432
439
then
433
440
echo " Using Swift version $SWIFT_VERSION "
0 commit comments