Skip to content

Commit 7d5bc07

Browse files
authored
Update crt to address mqtt websocket connect crash (#322)
* Update crt to address mqtt websocket connect crash * Update CI
1 parent 0c9d36e commit 7d5bc07

File tree

2 files changed

+35
-49
lines changed

2 files changed

+35
-49
lines changed

.github/workflows/ci.yml

Lines changed: 34 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@ on:
77
- "!main"
88

99
env:
10-
BUILDER_VERSION: v0.8.12
10+
BUILDER_VERSION: v0.8.29
1111
BUILDER_SOURCE: releases
1212
BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
1313
PACKAGE_NAME: aws-iot-device-sdk-cpp-v2
1414
LINUX_BASE_IMAGE: ubuntu-16-x64
1515
RUN: ${{ github.run_id }}-${{ github.run_number }}
16+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
17+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
18+
AWS_REGION: us-east-1
1619

1720
jobs:
1821
linux-compat:
@@ -22,64 +25,46 @@ jobs:
2225
image:
2326
- manylinux2014-x64
2427
- manylinux2014-x86
25-
steps:
26-
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
27-
- name: Build ${{ env.PACKAGE_NAME }}
28-
run: |
29-
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
30-
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ matrix.image }}:${{ env.BUILDER_VERSION }}
31-
docker pull $DOCKER_IMAGE
32-
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }}
28+
- al2-x64
3329

34-
al2:
35-
runs-on: ubuntu-latest
36-
steps:
37-
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
38-
- name: Build ${{ env.PACKAGE_NAME }} + consumers
39-
run: |
40-
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
41-
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-al2-x64:${{ env.BUILDER_VERSION }}
42-
docker pull $DOCKER_IMAGE
43-
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --spec=downstream
44-
45-
clang-compat:
46-
runs-on: ubuntu-latest
47-
strategy:
48-
matrix:
49-
version: [3, 6, 8, 9]
5030
steps:
5131
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
5232
- name: Build ${{ env.PACKAGE_NAME }}
5333
run: |
54-
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
55-
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
56-
docker pull $DOCKER_IMAGE
57-
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=clang-${{ matrix.version }} --config Debug
34+
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
35+
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }}
5836
59-
gcc-compat:
37+
linux-compiler-compat:
6038
runs-on: ubuntu-latest
6139
strategy:
6240
matrix:
63-
version: [4.8, 5, 6, 7, 8]
41+
version:
42+
- clang-3
43+
- clang-6
44+
- clang-8
45+
- clang-9
46+
- clang-10
47+
- clang-11
48+
- gcc-4.8
49+
- gcc-5
50+
- gcc-6
51+
- gcc-7
52+
- gcc-8
6453
steps:
6554
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
6655
- name: Build ${{ env.PACKAGE_NAME }}
6756
run: |
68-
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
69-
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
70-
docker pull $DOCKER_IMAGE
71-
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=gcc-${{ matrix.version }}
57+
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
58+
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }}
7259
7360
byo-crypto:
7461
runs-on: ubuntu-latest
7562
steps:
7663
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
7764
- name: Build ${{ env.PACKAGE_NAME }}
7865
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
66+
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
67+
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON skip_samples=1
8368
8469
windows-vs16:
8570
runs-on: windows-latest
@@ -119,15 +104,16 @@ jobs:
119104
chmod a+x builder
120105
./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream
121106
107+
122108
check-submodules:
123109
runs-on: ubuntu-latest
124110
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
111+
- name: Checkout Source
112+
uses: actions/checkout@v2
113+
with:
114+
submodules: true
115+
fetch-depth: 0
116+
- name: Check Submodules
117+
# note: using "@main" because "@${{env.BUILDER_VERSION}}" doesn't work
118+
# https://github.com/actions/runner/issues/480
119+
uses: awslabs/aws-crt-builder/.github/actions/check-submodules@main

crt/aws-crt-cpp

Submodule aws-crt-cpp updated 1334 files

0 commit comments

Comments
 (0)