Skip to content

Commit efd6f1b

Browse files
author
Justin Boswell
authored
Fixed windows compile warning, added windows+VS14 CI (#121)
* Updated builder version, added windows+vc14 CI * Import of latest generated SDK * clang-format on identity sample * clang-format needs to check cpp files
1 parent 65b8344 commit efd6f1b

File tree

7 files changed

+61
-19
lines changed

7 files changed

+61
-19
lines changed

‎.github/workflows/ci.yml

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- '!master'
88

99
env:
10-
BUILDER_VERSION: v0.6.0
10+
BUILDER_VERSION: v0.6.5
1111
BUILDER_SOURCE: releases
1212
BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
1313
PACKAGE_NAME: aws-iot-device-sdk-cpp-v2
@@ -31,7 +31,7 @@ jobs:
3131
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
3232
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ matrix.image }}:${{ env.BUILDER_VERSION }}
3333
docker pull $DOCKER_IMAGE
34-
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }}
34+
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }}
3535
3636
al2:
3737
runs-on: ubuntu-latest
@@ -42,8 +42,8 @@ jobs:
4242
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
4343
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-al2-x64:${{ env.BUILDER_VERSION }}
4444
docker pull $DOCKER_IMAGE
45-
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} al2-default-default-default-default-downstream
46-
45+
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --spec=downstream
46+
4747
clang-compat:
4848
runs-on: ubuntu-latest
4949
strategy:
@@ -56,29 +56,50 @@ jobs:
5656
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
5757
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
5858
docker pull $DOCKER_IMAGE
59-
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} linux-clang-${{ matrix.version }}-linux-x64 --config Debug
59+
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=clang-${{ matrix.version }} --config Debug
6060
6161
gcc-compat:
6262
runs-on: ubuntu-latest
6363
strategy:
6464
matrix:
65-
version: [4.8, 5, 6, 7, 8]
65+
version: [4.8, 5, 6, 7, 8]
6666
steps:
6767
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
6868
- name: Build ${{ env.PACKAGE_NAME }}
6969
run: |
7070
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
7171
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
7272
docker pull $DOCKER_IMAGE
73-
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} linux-gcc-${{ matrix.version }}-linux-x64
73+
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=gcc-${{ matrix.version }}
7474
75-
windows:
75+
windows-vs16:
7676
runs-on: windows-latest
7777
steps:
7878
- name: Build ${{ env.PACKAGE_NAME }} + consumers
7979
run: |
80+
md D:\a\work
81+
cd D:\a\work
8082
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder.pyz')"
81-
python builder.pyz build -p ${{ env.PACKAGE_NAME }} default-downstream
83+
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream
84+
85+
windows-vs14:
86+
runs-on: windows-latest
87+
strategy:
88+
matrix:
89+
arch: [x86, x64]
90+
steps:
91+
- uses: ilammy/msvc-dev-cmd@v1
92+
with:
93+
toolset: 14.0
94+
arch: ${{ matrix.arch }}
95+
uwp: false
96+
spectre: true
97+
- name: Build ${{ env.PACKAGE_NAME }} + consumers
98+
run: |
99+
md D:\a\work
100+
cd D:\a\work
101+
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
102+
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream
82103
83104
osx:
84105
runs-on: macos-latest
@@ -87,6 +108,4 @@ jobs:
87108
run: |
88109
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder')"
89110
chmod a+x builder
90-
./builder build -p ${{ env.PACKAGE_NAME }} default-downstream
91-
92-
111+
./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream

‎.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
steps:
1111
- name: Checkout Sources
1212
uses: actions/checkout@v1
13-
13+
1414
- name: clang-format lint
1515
uses: DoozyX/clang-format-lint-action@v0.3.1
1616
with:
1717
# List of extensions to check
18-
extensions: c,h
18+
extensions: cpp,h

‎identity/source/IotIdentityClient.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ namespace Aws
4646
const OnSubscribeToCreateCertificateFromCsrAcceptedResponse &handler,
4747
const OnSubscribeComplete &onSubAck)
4848
{
49+
(void)request;
4950
auto onSubscribeComplete = [handler, onSubAck](
5051
Aws::Crt::Mqtt::MqttConnection &,
5152
uint16_t,
@@ -97,6 +98,7 @@ namespace Aws
9798
const OnSubscribeToCreateKeysAndCertificateRejectedResponse &handler,
9899
const OnSubscribeComplete &onSubAck)
99100
{
101+
(void)request;
100102
auto onSubscribeComplete = [handler, onSubAck](
101103
Aws::Crt::Mqtt::MqttConnection &,
102104
uint16_t,
@@ -148,6 +150,7 @@ namespace Aws
148150
const OnSubscribeToRegisterThingAcceptedResponse &handler,
149151
const OnSubscribeComplete &onSubAck)
150152
{
153+
(void)request;
151154
auto onSubscribeComplete = [handler, onSubAck](
152155
Aws::Crt::Mqtt::MqttConnection &,
153156
uint16_t,
@@ -199,6 +202,7 @@ namespace Aws
199202
const OnSubscribeToRegisterThingRejectedResponse &handler,
200203
const OnSubscribeComplete &onSubAck)
201204
{
205+
(void)request;
202206
auto onSubscribeComplete = [handler, onSubAck](
203207
Aws::Crt::Mqtt::MqttConnection &,
204208
uint16_t,
@@ -250,6 +254,7 @@ namespace Aws
250254
const OnSubscribeToCreateKeysAndCertificateAcceptedResponse &handler,
251255
const OnSubscribeComplete &onSubAck)
252256
{
257+
(void)request;
253258
auto onSubscribeComplete = [handler, onSubAck](
254259
Aws::Crt::Mqtt::MqttConnection &,
255260
uint16_t,
@@ -301,6 +306,7 @@ namespace Aws
301306
const OnSubscribeToCreateCertificateFromCsrRejectedResponse &handler,
302307
const OnSubscribeComplete &onSubAck)
303308
{
309+
(void)request;
304310
auto onSubscribeComplete = [handler, onSubAck](
305311
Aws::Crt::Mqtt::MqttConnection &,
306312
uint16_t,

‎jobs/source/IotJobsClient.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ namespace Aws
5353
const OnSubscribeToUpdateJobExecutionAcceptedResponse &handler,
5454
const OnSubscribeComplete &onSubAck)
5555
{
56+
(void)request;
5657
auto onSubscribeComplete = [handler, onSubAck](
5758
Aws::Crt::Mqtt::MqttConnection &,
5859
uint16_t,
@@ -104,6 +105,7 @@ namespace Aws
104105
const OnSubscribeToGetPendingJobExecutionsRejectedResponse &handler,
105106
const OnSubscribeComplete &onSubAck)
106107
{
108+
(void)request;
107109
auto onSubscribeComplete = [handler, onSubAck](
108110
Aws::Crt::Mqtt::MqttConnection &,
109111
uint16_t,
@@ -155,6 +157,7 @@ namespace Aws
155157
const OnSubscribeToDescribeJobExecutionAcceptedResponse &handler,
156158
const OnSubscribeComplete &onSubAck)
157159
{
160+
(void)request;
158161
auto onSubscribeComplete = [handler, onSubAck](
159162
Aws::Crt::Mqtt::MqttConnection &,
160163
uint16_t,
@@ -206,6 +209,7 @@ namespace Aws
206209
const OnSubscribeToDescribeJobExecutionRejectedResponse &handler,
207210
const OnSubscribeComplete &onSubAck)
208211
{
212+
(void)request;
209213
auto onSubscribeComplete = [handler, onSubAck](
210214
Aws::Crt::Mqtt::MqttConnection &,
211215
uint16_t,
@@ -257,6 +261,7 @@ namespace Aws
257261
const OnSubscribeToUpdateJobExecutionRejectedResponse &handler,
258262
const OnSubscribeComplete &onSubAck)
259263
{
264+
(void)request;
260265
auto onSubscribeComplete = [handler, onSubAck](
261266
Aws::Crt::Mqtt::MqttConnection &,
262267
uint16_t,
@@ -308,6 +313,7 @@ namespace Aws
308313
const OnSubscribeToJobExecutionsChangedEventsResponse &handler,
309314
const OnSubscribeComplete &onSubAck)
310315
{
316+
(void)request;
311317
auto onSubscribeComplete = [handler, onSubAck](
312318
Aws::Crt::Mqtt::MqttConnection &,
313319
uint16_t,
@@ -357,6 +363,7 @@ namespace Aws
357363
const OnSubscribeToStartNextPendingJobExecutionRejectedResponse &handler,
358364
const OnSubscribeComplete &onSubAck)
359365
{
366+
(void)request;
360367
auto onSubscribeComplete = [handler, onSubAck](
361368
Aws::Crt::Mqtt::MqttConnection &,
362369
uint16_t,
@@ -408,6 +415,7 @@ namespace Aws
408415
const OnSubscribeToNextJobExecutionChangedEventsResponse &handler,
409416
const OnSubscribeComplete &onSubAck)
410417
{
418+
(void)request;
411419
auto onSubscribeComplete = [handler, onSubAck](
412420
Aws::Crt::Mqtt::MqttConnection &,
413421
uint16_t,
@@ -457,6 +465,7 @@ namespace Aws
457465
const OnSubscribeToGetPendingJobExecutionsAcceptedResponse &handler,
458466
const OnSubscribeComplete &onSubAck)
459467
{
468+
(void)request;
460469
auto onSubscribeComplete = [handler, onSubAck](
461470
Aws::Crt::Mqtt::MqttConnection &,
462471
uint16_t,
@@ -508,6 +517,7 @@ namespace Aws
508517
const OnSubscribeToStartNextPendingJobExecutionAcceptedResponse &handler,
509518
const OnSubscribeComplete &onSubAck)
510519
{
520+
(void)request;
511521
auto onSubscribeComplete = [handler, onSubAck](
512522
Aws::Crt::Mqtt::MqttConnection &,
513523
uint16_t,

‎samples/identity/fleet_provisioning/main.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include <condition_variable>
3737
#include <fstream>
3838
#include <iostream>
39-
#include <iostream>
4039
#include <mutex>
4140
#include <sstream>
4241
#include <streambuf>

‎shadow/cmake/IotShadow-cpp-config.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include(CMakeFindDependencyMacro)
33
find_dependency(aws-crt-cpp)
44

55
if (BUILD_SHARED_LIBS)
6-
include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
7-
else ()
8-
include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
9-
endif()
6+
include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
7+
else()
8+
include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
9+
endif()

‎shadow/source/IotShadowClient.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ namespace Aws
5050
const OnSubscribeToUpdateShadowRejectedResponse &handler,
5151
const OnSubscribeComplete &onSubAck)
5252
{
53+
(void)request;
5354
auto onSubscribeComplete = [handler, onSubAck](
5455
Aws::Crt::Mqtt::MqttConnection &,
5556
uint16_t,
@@ -101,6 +102,7 @@ namespace Aws
101102
const OnSubscribeToDeleteShadowRejectedResponse &handler,
102103
const OnSubscribeComplete &onSubAck)
103104
{
105+
(void)request;
104106
auto onSubscribeComplete = [handler, onSubAck](
105107
Aws::Crt::Mqtt::MqttConnection &,
106108
uint16_t,
@@ -152,6 +154,7 @@ namespace Aws
152154
const OnSubscribeToGetShadowAcceptedResponse &handler,
153155
const OnSubscribeComplete &onSubAck)
154156
{
157+
(void)request;
155158
auto onSubscribeComplete = [handler, onSubAck](
156159
Aws::Crt::Mqtt::MqttConnection &,
157160
uint16_t,
@@ -203,6 +206,7 @@ namespace Aws
203206
const OnSubscribeToShadowUpdatedEventsResponse &handler,
204207
const OnSubscribeComplete &onSubAck)
205208
{
209+
(void)request;
206210
auto onSubscribeComplete = [handler, onSubAck](
207211
Aws::Crt::Mqtt::MqttConnection &,
208212
uint16_t,
@@ -254,6 +258,7 @@ namespace Aws
254258
const OnSubscribeToShadowDeltaUpdatedEventsResponse &handler,
255259
const OnSubscribeComplete &onSubAck)
256260
{
261+
(void)request;
257262
auto onSubscribeComplete = [handler, onSubAck](
258263
Aws::Crt::Mqtt::MqttConnection &,
259264
uint16_t,
@@ -305,6 +310,7 @@ namespace Aws
305310
const OnSubscribeToDeleteShadowAcceptedResponse &handler,
306311
const OnSubscribeComplete &onSubAck)
307312
{
313+
(void)request;
308314
auto onSubscribeComplete = [handler, onSubAck](
309315
Aws::Crt::Mqtt::MqttConnection &,
310316
uint16_t,
@@ -356,6 +362,7 @@ namespace Aws
356362
const OnSubscribeToGetShadowRejectedResponse &handler,
357363
const OnSubscribeComplete &onSubAck)
358364
{
365+
(void)request;
359366
auto onSubscribeComplete = [handler, onSubAck](
360367
Aws::Crt::Mqtt::MqttConnection &,
361368
uint16_t,
@@ -407,6 +414,7 @@ namespace Aws
407414
const OnSubscribeToUpdateShadowAcceptedResponse &handler,
408415
const OnSubscribeComplete &onSubAck)
409416
{
417+
(void)request;
410418
auto onSubscribeComplete = [handler, onSubAck](
411419
Aws::Crt::Mqtt::MqttConnection &,
412420
uint16_t,

0 commit comments

Comments
 (0)