Skip to content

Commit 346e9fc

Browse files
authored
SWIFT-634 add Swift 5.1 variants to evg (#389)
1 parent 5f27a16 commit 346e9fc

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

.evergreen/config.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -412,11 +412,10 @@ axes:
412412
display_name: "Swift 5.0"
413413
variables:
414414
SWIFT_VERSION: "5.0.3"
415-
# TODO SWIFT-634: uncomment this
416-
# - id: "5.1"
417-
# display_name: "Swift 5.1"
418-
# variables:
419-
# SWIFT_VERSION: "5.1"
415+
- id: "5.1"
416+
display_name: "Swift 5.1"
417+
variables:
418+
SWIFT_VERSION: "5.1.3"
420419

421420
- id: ssl
422421
display_name: SSL

.evergreen/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -o errexit # Exit the script with error if any of the commands fail
44

55
# variables
66
PROJECT_DIRECTORY=${PROJECT_DIRECTORY:-$PWD}
7-
SWIFT_VERSION=${SWIFT_VERSION:-4.2.4}
7+
SWIFT_VERSION=${SWIFT_VERSION:-5.0.3}
88
INSTALL_DIR="${PROJECT_DIRECTORY}/opt"
99
BUILD_DIR="${PROJECT_DIRECTORY}/libmongoc-build"
1010
EVG_DIR=$(dirname $0)

.evergreen/run-atlas-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -o errexit # Exit the script with error if any of the commands fail
33

44
# variables
55
PROJECT_DIRECTORY=${PROJECT_DIRECTORY:-$PWD}
6-
SWIFT_VERSION=${SWIFT_VERSION:-5.0}
6+
SWIFT_VERSION=${SWIFT_VERSION:-5.0.3}
77
INSTALL_DIR="${PROJECT_DIRECTORY}/opt"
88
OS=$(uname -s | tr '[:upper:]' '[:lower:]')
99
EXTRA_FLAGS="-Xlinker -rpath -Xlinker ${INSTALL_DIR}/lib"

.evergreen/run-tests.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -o errexit # Exit the script with error if any of the commands fail
55
# variables
66
PROJECT_DIRECTORY=${PROJECT_DIRECTORY:-$PWD}
77
MONGODB_URI=${MONGODB_URI:-"NO_URI_PROVIDED"}
8-
SWIFT_VERSION=${SWIFT_VERSION:-5.0}
8+
SWIFT_VERSION=${SWIFT_VERSION:-5.0.3}
99
INSTALL_DIR="${PROJECT_DIRECTORY}/opt"
1010
TOPOLOGY=${TOPOLOGY:-single}
1111
OS=$(uname -s | tr '[:upper:]' '[:lower:]')
@@ -23,6 +23,11 @@ export SWIFTENV_ROOT="${INSTALL_DIR}/swiftenv"
2323
export PATH="${SWIFTENV_ROOT}/bin:$PATH"
2424
eval "$(swiftenv init -)"
2525

26+
# select the latest Xcode for Swift 5.1 support on MacOS
27+
if [ "$OS" == "darwin" ]; then
28+
sudo xcode-select -s /Applications/Xcode11.3.app
29+
fi
30+
2631
# switch swift version, and run tests
2732
swiftenv local $SWIFT_VERSION
2833

0 commit comments

Comments
 (0)