Skip to content

Commit 0ddf2b4

Browse files
bretambrosebretambrose
authored
Merge pull request #1 from awslabs/gg_release_2.4.x
Gg release 2.4.x
2 parents d377f2c + 58d9e07 commit 0ddf2b4

File tree

10 files changed

+1127
-243
lines changed

10 files changed

+1127
-243
lines changed

‎.github/workflows/ci.yml

Lines changed: 53 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
BUILDER_VERSION: v0.8.12
1111
BUILDER_SOURCE: releases
1212
BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
13-
PACKAGE_NAME: aws-iot-device-sdk-cpp-v2
13+
PACKAGE_NAME: STAGING-aws-iot-device-sdk-cpp-v2
1414
LINUX_BASE_IMAGE: ubuntu-16-x64
1515
RUN: ${{ github.run_id }}-${{ github.run_number }}
1616

@@ -23,71 +23,93 @@ jobs:
2323
- manylinux2014-x64
2424
- manylinux2014-x86
2525
steps:
26+
- name: Checkout Sources
27+
uses: actions/checkout@v2
28+
with:
29+
submodules: "recursive"
2630
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
2731
- name: Build ${{ env.PACKAGE_NAME }}
2832
run: |
2933
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
3034
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ matrix.image }}:${{ env.BUILDER_VERSION }}
3135
docker pull $DOCKER_IMAGE
32-
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }}
36+
docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }}
3337
3438
al2:
3539
runs-on: ubuntu-latest
3640
steps:
41+
- name: Checkout Sources
42+
uses: actions/checkout@v2
43+
with:
44+
submodules: "recursive"
3745
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
3846
- name: Build ${{ env.PACKAGE_NAME }} + consumers
3947
run: |
4048
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
4149
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-al2-x64:${{ env.BUILDER_VERSION }}
4250
docker pull $DOCKER_IMAGE
43-
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --spec=downstream
51+
docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --spec=downstream
4452
4553
clang-compat:
4654
runs-on: ubuntu-latest
4755
strategy:
4856
matrix:
4957
version: [3, 6, 8, 9]
5058
steps:
59+
- name: Checkout Sources
60+
uses: actions/checkout@v2
61+
with:
62+
submodules: "recursive"
5163
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
5264
- name: Build ${{ env.PACKAGE_NAME }}
5365
run: |
5466
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
5567
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
5668
docker pull $DOCKER_IMAGE
57-
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=clang-${{ matrix.version }} --config Debug
69+
docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=clang-${{ matrix.version }} --config Debug
5870
5971
gcc-compat:
6072
runs-on: ubuntu-latest
6173
strategy:
6274
matrix:
6375
version: [4.8, 5, 6, 7, 8]
6476
steps:
77+
- name: Checkout Sources
78+
uses: actions/checkout@v2
79+
with:
80+
submodules: "recursive"
6581
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
6682
- name: Build ${{ env.PACKAGE_NAME }}
6783
run: |
6884
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
6985
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
7086
docker pull $DOCKER_IMAGE
71-
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=gcc-${{ matrix.version }}
87+
docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=gcc-${{ matrix.version }}
7288
7389
byo-crypto:
7490
runs-on: ubuntu-latest
7591
steps:
76-
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
77-
- name: Build ${{ env.PACKAGE_NAME }}
78-
run: |
79-
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
80-
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
81-
docker pull $DOCKER_IMAGE
82-
docker run --env GITHUB_REF $DOCKER_IMAGE --version=${BUILDER_VERSION} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON skip_samples=1
92+
- name: Checkout Sources
93+
uses: actions/checkout@v2
94+
with:
95+
submodules: "recursive"
96+
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
97+
- name: Build ${{ env.PACKAGE_NAME }}
98+
run: |
99+
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
100+
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
101+
docker pull $DOCKER_IMAGE
102+
docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} --env GITHUB_REF $DOCKER_IMAGE --version=${BUILDER_VERSION} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON skip_samples=1
83103
84104
windows-vs16:
85105
runs-on: windows-latest
86106
steps:
107+
- name: Checkout Sources
108+
uses: actions/checkout@v2
109+
with:
110+
submodules: "recursive"
87111
- name: Build ${{ env.PACKAGE_NAME }} + consumers
88112
run: |
89-
md D:\a\work
90-
cd D:\a\work
91113
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder.pyz')"
92114
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream
93115
@@ -97,6 +119,10 @@ jobs:
97119
matrix:
98120
arch: [x86, x64]
99121
steps:
122+
- name: Checkout Sources
123+
uses: actions/checkout@v2
124+
with:
125+
submodules: "recursive"
100126
- uses: ilammy/msvc-dev-cmd@v1
101127
with:
102128
toolset: 14.0
@@ -105,14 +131,16 @@ jobs:
105131
spectre: true
106132
- name: Build ${{ env.PACKAGE_NAME }} + consumers
107133
run: |
108-
md D:\a\work
109-
cd D:\a\work
110134
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
111135
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream
112136
113137
osx:
114138
runs-on: macos-latest
115139
steps:
140+
- name: Checkout Sources
141+
uses: actions/checkout@v2
142+
with:
143+
submodules: "recursive"
116144
- name: Build ${{ env.PACKAGE_NAME }} + consumers
117145
run: |
118146
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder')"
@@ -122,12 +150,12 @@ jobs:
122150
check-submodules:
123151
runs-on: ubuntu-latest
124152
steps:
125-
- name: Checkout Source
126-
uses: actions/checkout@v2
127-
with:
128-
submodules: true
129-
fetch-depth: 0
130-
- name: Check Submodules
131-
# note: using "@main" because "@${{env.BUILDER_VERSION}}" doesn't work
132-
# https://github.com/actions/runner/issues/480
133-
uses: awslabs/aws-crt-builder/.github/actions/check-submodules@main
153+
- name: Checkout Source
154+
uses: actions/checkout@v2
155+
with:
156+
submodules: true
157+
fetch-depth: 0
158+
- name: Check Submodules
159+
# note: using "@main" because "@${{env.BUILDER_VERSION}}" doesn't work
160+
# https://github.com/actions/runner/issues/480
161+
uses: awslabs/aws-crt-builder/.github/actions/check-submodules@main

‎builder.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "aws-iot-device-sdk-cpp-v2",
2+
"name": "STAGING-aws-iot-device-sdk-cpp-v2",
33
"!cmake_args": [
44
"-DPERFORM_HEADER_CHECK=OFF",
55
"-DS2N_NO_PQ_ASM=ON"

‎crt/aws-c-iot

‎eventstream_rpc/tests/include/awstest/EchoTestRpcClient.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ namespace Awstest
2626
Aws::Crt::Allocator *allocator = Aws::Crt::g_allocator) noexcept;
2727
/**
2828
* Connect the client to the server
29-
* @param lifecycleHandler An interface that is called upon when lifecycle events relating to the connection
30-
* occur.
31-
* @param connectionConfig The configuration parameters used for establishing the connection.
32-
* @return An `RpcError` that can be used to check whether the connection was established.
29+
* @param lifecycleHandler An interface that is called upon when lifecycle
30+
* events relating to the connection occur.
31+
* @param connectionConfig The configuration parameters used for establishing
32+
* the connection.
33+
* @return An `RpcError` that can be used to check whether the connection was
34+
* established.
3335
*/
3436
std::future<RpcError> Connect(
3537
ConnectionLifecycleHandler &lifecycleHandler,

0 commit comments

Comments
 (0)