diff options
| author | Andrew Morrow <acm@mongodb.com> | 2018-06-15 08:11:00 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2018-06-19 15:46:02 -0400 |
| commit | 32d04037b7b37ed68925b21b24dbd8e032ea7b48 (patch) | |
| tree | f49318fb07c7730ff252fe183818322afdd3bea3 | |
| parent | 77f43172584a0302df127174b9b0bd2259730772 (diff) | |
| download | mongo-32d04037b7b37ed68925b21b24dbd8e032ea7b48.tar.gz | |
SERVER-35600 Downgrade to watch os 4.2 for CI simulator support
| -rw-r--r-- | etc/evergreen.yml | 20 | ||||
| -rw-r--r-- | etc/scons/xcode_watchos.vars | 4 | ||||
| -rw-r--r-- | etc/scons/xcode_watchos_sim.vars | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 02395552045..7b07036135c 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -9508,8 +9508,8 @@ buildvariants: tasks: - name: compile_mobile -- name: embedded-sdk-watchos-4.3 - display_name: "Embedded SDK - watchOS 4.3" +- name: embedded-sdk-watchos-4.2 + display_name: "Embedded SDK - watchOS 4.2" run_on: - macos-1012 batchtime: 1440 # 1 day @@ -9534,15 +9534,15 @@ buildvariants: -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY - -DCMAKE_C_FLAGS="-arch armv7k -isysroot $(xcrun --sdk watchos --show-sdk-path) -mwatchos-version-min=4.3" - -DCMAKE_LINKER_FLAGS="-arch armv7k -isysroot $(xcrun --sdk watchos --show-sdk-path) -mwatchos-version-min=4.3" + -DCMAKE_C_FLAGS="-arch armv7k -isysroot $(xcrun --sdk watchos --show-sdk-path) -mwatchos-version-min=4.2" + -DCMAKE_LINKER_FLAGS="-arch armv7k -isysroot $(xcrun --sdk watchos --show-sdk-path) -mwatchos-version-min=4.2" -DCMAKE_INSTALL_NAME_DIR=@rpath disable_unit_tests: true tasks: - name: compile_mobile -- name: embedded-sdk-watchsimulator-4.3 - display_name: "Embedded SDK - watchOS Simulator 4.3" +- name: embedded-sdk-watchsimulator-4.2 + display_name: "Embedded SDK - watchOS Simulator 4.2" run_on: - macos-1012 batchtime: 1440 # 1 day @@ -9567,13 +9567,13 @@ buildvariants: -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY - -DCMAKE_C_FLAGS="-arch i386 -isysroot $(xcrun --sdk watchsimulator --show-sdk-path) -mwatchos-version-min=4.3" - -DCMAKE_LINKER_FLAGS="-arch i386 -isysroot $(xcrun --sdk watchsimulator --show-sdk-path) -mwatchos-version-min=4.3" + -DCMAKE_C_FLAGS="-arch i386 -isysroot $(xcrun --sdk watchsimulator --show-sdk-path) -mwatchos-version-min=4.2" + -DCMAKE_LINKER_FLAGS="-arch i386 -isysroot $(xcrun --sdk watchsimulator --show-sdk-path) -mwatchos-version-min=4.2" -DCMAKE_INSTALL_NAME_DIR=@rpath disable_unit_tests: true - enable_embedded_tests: ios_watchos_simulator + enable_embedded_tests: ios_tvos_simulator ios_sim_device: Apple-Watch-Series-3-42mm - ios_sim_runtime: watchOS-4-3 + ios_sim_runtime: watchOS-4-2 tasks: - name: compile_mobile diff --git a/etc/scons/xcode_watchos.vars b/etc/scons/xcode_watchos.vars index b431e3f05f8..45ae87c9c9f 100644 --- a/etc/scons/xcode_watchos.vars +++ b/etc/scons/xcode_watchos.vars @@ -7,8 +7,8 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'watchos', 'clang++']).st sdk_path = subprocess.check_output(['xcrun', '--sdk', 'watchos', '--show-sdk-path']).strip() -CCFLAGS = "-isysroot {} -mwatchos-version-min=4.3 -arch armv7k -fembed-bitcode".format(sdk_path) -LINKFLAGS = "-Wl,-syslibroot,{} -mwatchos-version-min=4.3 -arch armv7k".format(sdk_path) +CCFLAGS = "-isysroot {} -mwatchos-version-min=4.2 -arch armv7k -fembed-bitcode".format(sdk_path) +LINKFLAGS = "-Wl,-syslibroot,{} -mwatchos-version-min=4.2 -arch armv7k".format(sdk_path) TARGET_OS = "watchOS" TARGET_ARCH = "arm" diff --git a/etc/scons/xcode_watchos_sim.vars b/etc/scons/xcode_watchos_sim.vars index a9f5dea7856..e3e0310666b 100644 --- a/etc/scons/xcode_watchos_sim.vars +++ b/etc/scons/xcode_watchos_sim.vars @@ -7,8 +7,8 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'watchsimulator', 'clang+ sdk_path = subprocess.check_output(['xcrun', '--sdk', 'watchsimulator', '--show-sdk-path']).strip() -CCFLAGS = "-isysroot {} -mwatchos-version-min=4.3 -arch i386".format(sdk_path) -LINKFLAGS = "-Wl,-syslibroot,{} -mwatchos-version-min=4.3 -arch i386".format(sdk_path) +CCFLAGS = "-isysroot {} -mwatchos-version-min=4.2 -arch i386".format(sdk_path) +LINKFLAGS = "-Wl,-syslibroot,{} -mwatchos-version-min=4.2 -arch i386".format(sdk_path) TARGET_OS = "watchOS-sim" TARGET_ARCH = "i386" |