Skip to content
This repository was archived by the owner on Jan 25, 2023. It is now read-only.

Commit 457b353

Browse files
committed
Use Swift if SWIFT_VERSION is set by user
1 parent 4d250b3 commit 457b353

File tree

2 files changed

+20
-14
lines changed

2 files changed

+20
-14
lines changed

run-build-functions.sh

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,7 @@ install_dependencies() {
176176
local defaultYarnVersion=$3
177177
local defaultPHPVersion=$4
178178
local installGoVersion=$5
179-
local defaultSwiftVersion=$6
180-
local defaultPythonVersion=$7
179+
local defaultPythonVersion=$6
181180

182181
# Python Version
183182
if [ -f runtime.txt ]
@@ -408,26 +407,34 @@ install_dependencies() {
408407
fi
409408

410409
# Swift Version
411-
: ${SWIFT_VERSION="$defaultSwiftVersion"}
410+
defaultSwiftVersion="5.2"
412411
if [ -f .swift-version ]
413412
then
414413
SWIFT_VERSION=$(cat .swift-version)
415414
echo "Attempting Swift version '$SWIFT_VERSION' from .swift-version"
416415
fi
417416

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 ]
419419
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"}
425421
fi
426422

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" ]
430424
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
431438
if PLATFORM='' URL='' VERSION='' swiftenv install -s $SWIFT_VERSION
432439
then
433440
echo "Using Swift version $SWIFT_VERSION"

run-build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@ cd $NETLIFY_REPO_DIR
2323
: ${YARN_VERSION="1.22.4"}
2424
: ${PHP_VERSION="5.6"}
2525
: ${GO_VERSION="1.14.4"}
26-
: ${SWIFT_VERSION="5.2"}
2726
: ${PYTHON_VERSION="2.7"}
2827

2928
echo "Installing dependencies"
30-
install_dependencies $NODE_VERSION $RUBY_VERSION $YARN_VERSION $PHP_VERSION $GO_VERSION $SWIFT_VERSION $PYTHON_VERSION
29+
install_dependencies $NODE_VERSION $RUBY_VERSION $YARN_VERSION $PHP_VERSION $GO_VERSION $PYTHON_VERSION
3130

3231
echo "Installing missing commands"
3332
install_missing_commands

0 commit comments

Comments
 (0)