From 574b8ef449ec7975232ab0aae6593c32255671b5 Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Tue, 10 Mar 2020 12:38:36 -0700 Subject: [PATCH 01/10] Enabled compilation on VS 2015 --- .github/workflows/ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f0f5eea8..d23d4af56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,6 +78,19 @@ jobs: python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder', 'builder.pyz')" python builder.pyz -p ${{ env.PACKAGE_NAME }} build + windows-vc14: + runs-on: windows-latest + strategy: + matrix: + arch: [x86, x64] + steps: + - uses: ilammy/msvc-dev-cmd@v1 + with: + toolset: 14.11 + arch: ${{ matrix.arch }} + uwp: false + spectre: true + osx: runs-on: macos-latest steps: From fbdc9f999da533c19731bd942036c2f3403eb438 Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Tue, 10 Mar 2020 12:47:04 -0700 Subject: [PATCH 02/10] Fix VS narrowing warning --- source/hpack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/hpack.c b/source/hpack.c index 79bae1221..e859162c6 100644 --- a/source/hpack.c +++ b/source/hpack.c @@ -1147,7 +1147,7 @@ int aws_hpack_decode( HPACK_LOG(ERROR, context, "Dynamic table update size is absurdly large"); return aws_raise_error(AWS_ERROR_HTTP_COMPRESSION); } - size_t size = *size64; + size_t size = (size_t)*size64; HPACK_LOGF(TRACE, context, "Dynamic table size update %zu", size); if (aws_hpack_resize_dynamic_table(context, size)) { From 4e0a5f71f5d0a60f407e18fb743f19da0ad7c0d0 Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Tue, 10 Mar 2020 12:54:04 -0700 Subject: [PATCH 03/10] Use default VC14 toolset --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d23d4af56..4c956ce72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,7 +86,7 @@ jobs: steps: - uses: ilammy/msvc-dev-cmd@v1 with: - toolset: 14.11 + toolset: 14.0 arch: ${{ matrix.arch }} uwp: false spectre: true From 761d6b94726f7e1d003075d8293f09ba23ec0d40 Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Tue, 10 Mar 2020 12:55:19 -0700 Subject: [PATCH 04/10] Turn builds on for VC14 --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c956ce72..23640ec25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,6 +90,10 @@ jobs: arch: ${{ matrix.arch }} uwp: false spectre: true + - name: Build ${{ env.PACKAGE_NAME }} + consumers + run: | + python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder', 'builder.pyz')" + python builder.pyz -p ${{ env.PACKAGE_NAME }} build osx: runs-on: macos-latest From dd0c18350fb5d06ef7b075130dbc0a35b5b25ede Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Tue, 10 Mar 2020 13:16:40 -0700 Subject: [PATCH 05/10] Updated to latest builder --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23640ec25..f0ca907b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: - '!master' env: - BUILDER_VERSION: v0.3.1 + BUILDER_VERSION: v0.5.2 BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net PACKAGE_NAME: aws-c-http LINUX_BASE_IMAGE: ubuntu-16-x64 From 0a87a84a071c6233b8be114e0537e284a20407f8 Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Tue, 10 Mar 2020 13:17:56 -0700 Subject: [PATCH 06/10] Fixed builder download url --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0ca907b2..547129263 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,7 @@ jobs: steps: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | - python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder', 'builder.pyz')" + python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder.pyz')" python builder.pyz -p ${{ env.PACKAGE_NAME }} build windows-vc14: @@ -92,7 +92,7 @@ jobs: spectre: true - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | - python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder', 'builder.pyz')" + python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder.pyz')" python builder.pyz -p ${{ env.PACKAGE_NAME }} build osx: @@ -100,7 +100,7 @@ jobs: steps: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | - python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder', 'builder')" + python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder')" chmod a+x builder ./builder -p ${{ env.PACKAGE_NAME }} build default-downstream From 9f7137d78767159159f15eac35753b398a78ef62 Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Tue, 10 Mar 2020 13:22:24 -0700 Subject: [PATCH 07/10] Fixed cache busting for cloudfront downloads --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 547129263..217092cf2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,6 +11,7 @@ env: BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net PACKAGE_NAME: aws-c-http LINUX_BASE_IMAGE: ubuntu-16-x64 + RUN: ${{ github.run_id }}-${{ github.run_number }} jobs: linux-compat: @@ -75,7 +76,7 @@ jobs: steps: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | - python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder.pyz')" + python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" python builder.pyz -p ${{ env.PACKAGE_NAME }} build windows-vc14: @@ -92,7 +93,7 @@ jobs: spectre: true - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | - python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder.pyz')" + python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" python builder.pyz -p ${{ env.PACKAGE_NAME }} build osx: @@ -100,7 +101,7 @@ jobs: steps: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | - python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder')" + python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" chmod a+x builder ./builder -p ${{ env.PACKAGE_NAME }} build default-downstream From b555e225f26a32ada552a5e2ee12c3687275141b Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Tue, 10 Mar 2020 13:26:38 -0700 Subject: [PATCH 08/10] Cleaned up CI spec coinciding with new builder version --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 217092cf2..c90cb7951 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ matrix.image }}:${{ env.BUILDER_VERSION }} docker pull $DOCKER_IMAGE - docker run --env GITHUB_REF $DOCKER_IMAGE -p ${{ env.PACKAGE_NAME }} build manylinux-default-default-default-default + docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} downstream al2: runs-on: ubuntu-latest @@ -41,7 +41,7 @@ jobs: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-al2-x64:${{ env.BUILDER_VERSION }} docker pull $DOCKER_IMAGE - docker run --env GITHUB_REF $DOCKER_IMAGE -p ${{ env.PACKAGE_NAME }} build al2-default-default-default-default-downstream + docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} downstream clang-compat: runs-on: ubuntu-latest @@ -55,7 +55,7 @@ jobs: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }} docker pull $DOCKER_IMAGE - docker run --env GITHUB_REF $DOCKER_IMAGE -p ${{ env.PACKAGE_NAME }} build linux-clang-${{ matrix.version }}-linux-x64 + docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=clang-${{ matrix.version }} gcc-compat: runs-on: ubuntu-latest @@ -69,7 +69,7 @@ jobs: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }} docker pull $DOCKER_IMAGE - docker run --env GITHUB_REF $DOCKER_IMAGE -p ${{ env.PACKAGE_NAME }} build linux-gcc-${{ matrix.version }}-linux-x64 + docker run --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --compiler=gcc-${{ matrix.version }} windows: runs-on: windows-latest @@ -77,7 +77,7 @@ jobs: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" - python builder.pyz -p ${{ env.PACKAGE_NAME }} build + python builder.pyz build -p ${{ env.PACKAGE_NAME }} windows-vc14: runs-on: windows-latest @@ -94,7 +94,7 @@ jobs: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" - python builder.pyz -p ${{ env.PACKAGE_NAME }} build + python builder.pyz build -p ${{ env.PACKAGE_NAME }} osx: runs-on: macos-latest @@ -103,6 +103,6 @@ jobs: run: | python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" chmod a+x builder - ./builder -p ${{ env.PACKAGE_NAME }} build default-downstream + ./builder build -p ${{ env.PACKAGE_NAME }} downstream From eed5db974be0b9c5715263e5879b07c398b3c7ec Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Tue, 10 Mar 2020 16:18:55 -0700 Subject: [PATCH 09/10] Use project-fixes channel of builder --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c90cb7951..eccc146f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: - '!master' env: - BUILDER_VERSION: v0.5.2 + BUILDER_VERSION: project-fixes BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net PACKAGE_NAME: aws-c-http LINUX_BASE_IMAGE: ubuntu-16-x64 From bc7ac9dd1822aedd6b60e7d1bef16cff676f4c66 Mon Sep 17 00:00:00 2001 From: Justin Boswell Date: Tue, 10 Mar 2020 16:46:55 -0700 Subject: [PATCH 10/10] Updated to v0.5.3 of builder --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eccc146f6..382a3ebe1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: - '!master' env: - BUILDER_VERSION: project-fixes + BUILDER_VERSION: v0.5.3 BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net PACKAGE_NAME: aws-c-http LINUX_BASE_IMAGE: ubuntu-16-x64