Skip to content

Commit f39adf5

Browse files
sbSteveKxiazhverasfod
authored
CD fix for Windows TLS 1.3 (#867)
Co-authored-by: Vera Xia <zhvxia@amazon.com> Co-authored-by: Igor Abdrakhimov <octosyllabic@gmail.com>
1 parent 6af77cb commit f39adf5

3 files changed

Lines changed: 33 additions & 3 deletions

File tree

codebuild/cd/windows-vs2015-x64-build.bat

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
echo PATH=%PATH%
55
echo JAVA_HOME=%JAVA_HOME%
66

7-
set AWS_CMAKE_GENERATOR=Visual Studio 14 2015 Win64
7+
set AWS_CRT_WINDOWS_SDK_VERSION=10.0.17763.0
8+
@REM The last Windows 10 SDK version that VS 2015 can target is 10.0.14393.0.
9+
@REM To target 10.0.17763.0, we need to use the VS 2017 and later generator.
10+
@REM "VS 2015 Users: The Windows 10 SDK (15063, 16299, 17134, 17763) is
11+
@REM officially only supported for VS 2017." From:
12+
@REM https://blogs.msdn.microsoft.com/chuckw/2018/10/02/windows-10-october-2018-update/
13+
set AWS_CMAKE_GENERATOR=Visual Studio 15 2017 Win64
814

915
git submodule update --init
1016

codebuild/cd/windows-vs2015-x86-build.bat

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
echo PATH=%PATH%
55
echo JAVA_HOME=%JAVA_HOME%
66

7-
set AWS_CMAKE_GENERATOR=Visual Studio 14 2015
7+
set AWS_CRT_WINDOWS_SDK_VERSION=10.0.17763.0
8+
@REM The last Windows 10 SDK version that VS 2015 can target is 10.0.14393.0.
9+
@REM To target 10.0.17763.0, we need to use the VS 2017 and later generator.
10+
@REM "VS 2015 Users: The Windows 10 SDK (15063, 16299, 17134, 17763) is
11+
@REM officially only supported for VS 2017." From:
12+
@REM https://blogs.msdn.microsoft.com/chuckw/2018/10/02/windows-10-october-2018-update/
13+
set AWS_CMAKE_GENERATOR=Visual Studio 15 2017
814

915
git submodule update --init
1016

pom.xml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<cmake.buildtype></cmake.buildtype>
7979
<cmake.buildconfig>RelWithDebInfo</cmake.buildconfig>
8080
<cmake.cflags/>
81-
</properties>
81+
</properties>
8282
</profile>
8383
<!-- Unix/Linux/OSX profiles: use makefiles and the "all" compile target -->
8484
<profile>
@@ -187,6 +187,7 @@
187187
<argument>--no-warn-unused-cli</argument>
188188
<argument>${cmake.generator}</argument>
189189
<argument>${cmake.toolset}</argument>
190+
<argument>${cmake.windows-sdk-version}</argument>
190191
</arguments>
191192
</configuration>
192193
</execution>
@@ -436,6 +437,23 @@
436437
</target>
437438
</configuration>
438439
</execution>
440+
<execution>
441+
<id>windows-sdk-version</id>
442+
<phase>initialize</phase>
443+
<goals>
444+
<goal>run</goal>
445+
</goals>
446+
<configuration>
447+
<exportAntProperties>true</exportAntProperties>
448+
<target>
449+
<property environment="env"/>
450+
<condition property="cmake.windows-sdk-version" value="-DCMAKE_SYSTEM_VERSION=${env.AWS_CRT_WINDOWS_SDK_VERSION}" else="-DWINDOWS_SDK_VERSION_DUMMY=1">
451+
<isset property="env.AWS_CRT_WINDOWS_SDK_VERSION" />
452+
</condition>
453+
<echo message="Windows SDK version = ${cmake.windows-sdk-version}"/>
454+
</target>
455+
</configuration>
456+
</execution>
439457
<execution>
440458
<id>cmake-toolset</id>
441459
<phase>initialize</phase>

0 commit comments

Comments
 (0)