Skip to content

Commit 2196e04

Browse files
author
Justin Boswell
authored
Enabled compilation on VS 2015 (#196)
* Enabled compilation on VS 2015 * Fix VS narrowing warning * Updated to v0.5.3 of builder
1 parent 8c7721a commit 2196e04

File tree

2 files changed

+28
-10
lines changed

2 files changed

+28
-10
lines changed

.github/workflows/ci.yml

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ on:
77
- '!master'
88

99
env:
10-
BUILDER_VERSION: v0.3.1
10+
BUILDER_VERSION: v0.5.3
1111
BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
1212
PACKAGE_NAME: aws-c-http
1313
LINUX_BASE_IMAGE: ubuntu-16-x64
14+
RUN: ${{ github.run_id }}-${{ github.run_number }}
1415

1516
jobs:
1617
linux-compat:
@@ -29,7 +30,7 @@ jobs:
2930
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
3031
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ matrix.image }}:${{ env.BUILDER_VERSION }}
3132
docker pull $DOCKER_IMAGE
32-
docker run --env GITHUB_REF $DOCKER_IMAGE -p ${{ env.PACKAGE_NAME }} build manylinux-default-default-default-default
33+
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} downstream
3334
3435
al2:
3536
runs-on: ubuntu-latest
@@ -40,7 +41,7 @@ jobs:
4041
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
4142
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-al2-x64:${{ env.BUILDER_VERSION }}
4243
docker pull $DOCKER_IMAGE
43-
docker run --env GITHUB_REF $DOCKER_IMAGE -p ${{ env.PACKAGE_NAME }} build al2-default-default-default-default-downstream
44+
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} downstream
4445
4546
clang-compat:
4647
runs-on: ubuntu-latest
@@ -54,7 +55,7 @@ jobs:
5455
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
5556
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
5657
docker pull $DOCKER_IMAGE
57-
docker run --env GITHUB_REF $DOCKER_IMAGE -p ${{ env.PACKAGE_NAME }} build linux-clang-${{ matrix.version }}-linux-x64
58+
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=clang-${{ matrix.version }}
5859
5960
gcc-compat:
6061
runs-on: ubuntu-latest
@@ -68,23 +69,40 @@ jobs:
6869
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
6970
export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
7071
docker pull $DOCKER_IMAGE
71-
docker run --env GITHUB_REF $DOCKER_IMAGE -p ${{ env.PACKAGE_NAME }} build linux-gcc-${{ matrix.version }}-linux-x64
72+
docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=gcc-${{ matrix.version }}
7273
7374
windows:
7475
runs-on: windows-latest
7576
steps:
7677
- name: Build ${{ env.PACKAGE_NAME }} + consumers
7778
run: |
78-
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder', 'builder.pyz')"
79-
python builder.pyz -p ${{ env.PACKAGE_NAME }} build
79+
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
80+
python builder.pyz build -p ${{ env.PACKAGE_NAME }}
81+
82+
windows-vc14:
83+
runs-on: windows-latest
84+
strategy:
85+
matrix:
86+
arch: [x86, x64]
87+
steps:
88+
- uses: ilammy/msvc-dev-cmd@v1
89+
with:
90+
toolset: 14.0
91+
arch: ${{ matrix.arch }}
92+
uwp: false
93+
spectre: true
94+
- name: Build ${{ env.PACKAGE_NAME }} + consumers
95+
run: |
96+
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
97+
python builder.pyz build -p ${{ env.PACKAGE_NAME }}
8098
8199
osx:
82100
runs-on: macos-latest
83101
steps:
84102
- name: Build ${{ env.PACKAGE_NAME }} + consumers
85103
run: |
86-
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder', 'builder')"
104+
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
87105
chmod a+x builder
88-
./builder -p ${{ env.PACKAGE_NAME }} build default-downstream
106+
./builder build -p ${{ env.PACKAGE_NAME }} downstream
89107
90108

source/hpack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ int aws_hpack_decode(
11471147
HPACK_LOG(ERROR, context, "Dynamic table update size is absurdly large");
11481148
return aws_raise_error(AWS_ERROR_HTTP_COMPRESSION);
11491149
}
1150-
size_t size = *size64;
1150+
size_t size = (size_t)*size64;
11511151

11521152
HPACK_LOGF(TRACE, context, "Dynamic table size update %zu", size);
11531153
if (aws_hpack_resize_dynamic_table(context, size)) {

0 commit comments

Comments
 (0)