Skip to content

Windows variants ticket #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

Windows variants ticket #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
44e7f38
Fix Windows x86 CI
graebm Nov 30, 2021
e27a948
Fix MSVC compiler warning
graebm Nov 30, 2021
542d0a1
Update CRT
sbSteveK Feb 16, 2022
661d640
errors referencing SetPortA and GetMessageA on Windows builds
sbSteveK Feb 21, 2022
0503f75
updated aws-c-iot to latest version
sbSteveK Feb 21, 2022
5e83764
using tags instead of -latest for windows
sbSteveK Feb 21, 2022
ff21c1c
testing with only proper tagging
sbSteveK Feb 21, 2022
48a8672
SetPort and GetMessage is still an issue. Reinstated undefs
sbSteveK Feb 21, 2022
eefd2e5
changed arch from win32 to x86
sbSteveK Feb 21, 2022
4415bfa
restored Win32
sbSteveK Feb 21, 2022
d5594f0
Made AWS::aws-crt-cpp PRIVATE to separate them from the link interface.
sbSteveK Feb 21, 2022
f417245
added aws-c-iot to packages in basic_pub_sub
sbSteveK Feb 21, 2022
b4775e7
reverting CMakeLists for basic_pub_sub
sbSteveK Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,34 +75,28 @@ jobs:
aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DUSE_CPU_EXTENSIONS=OFF

windows-vs16:
runs-on: windows-latest
windows:
runs-on: windows-2022 # latest
steps:
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
md D:\a\work
cd D:\a\work
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder.pyz')"
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream
python builder.pyz build -p ${{ env.PACKAGE_NAME }}

windows-vs14:
runs-on: windows-latest
runs-on: windows-2019 # windows-2019 is last env with Visual Studio 2015 (v14.0)
strategy:
matrix:
arch: [x86, x64]
arch: [Win32, x64]
steps:
- uses: ilammy/msvc-dev-cmd@v1
with:
toolset: 14.0
arch: ${{ matrix.arch }}
uwp: false
spectre: true
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
md D:\a\work
cd D:\a\work
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-Tv140 --cmake-extra=-A${{ matrix.arch }}

windows-no-cpu-extensions:
runs-on: windows-latest
Expand Down
2 changes: 1 addition & 1 deletion crt/aws-c-iot
Open in desktop
Submodule aws-c-iot updated 7 files
+17 −34 .github/workflows/ci.yml
+11 −5 include/aws/iotdevice/private/secure_tunneling_impl.h
+6 −4 source/linux/network.c
+20 −33 source/secure_tunneling.c
+2 −0 tests/CMakeLists.txt
+13 −0 tests/metrics_tests.c
+247 −5 tests/secure_tunneling_tests.c
2 changes: 1 addition & 1 deletion crt/aws-crt-cpp
Open in desktop
Submodule aws-crt-cpp updated 146 files
2 changes: 1 addition & 1 deletion eventstream_rpc/source/EventStreamClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,7 +1302,7 @@ namespace Aws
const Crt::Optional<Crt::ByteBuf> &payload,
uint32_t messageFlags)
{
bool streamAlreadyTerminated = messageFlags & AWS_EVENT_STREAM_RPC_MESSAGE_FLAG_TERMINATE_STREAM;
bool streamAlreadyTerminated = (messageFlags & AWS_EVENT_STREAM_RPC_MESSAGE_FLAG_TERMINATE_STREAM) != 0;

Crt::StringView payloadStringView;
if (payload.has_value())
Expand Down
5 changes: 5 additions & 0 deletions eventstream_rpc/tests/EventStreamClientTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
#include <queue>
#include <sstream>

#ifdef WIN32
# undef SetPort
# undef GetMessage
#endif

using namespace Aws::Crt;
using namespace Aws::Eventstreamrpc;
using namespace Awstest;
Expand Down