From 42e5c0ae022af1cfb20e241534d08c746ef83420 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 25 Jan 2023 16:02:41 -0800 Subject: [PATCH] Update submodules (#89) --- .github/workflows/ci.yml | 11 ++++++++++- builder.json | 3 ++- crt/aws-c-auth | 2 +- crt/aws-c-cal | 2 +- crt/aws-c-common | 2 +- crt/aws-c-compression | 2 +- crt/aws-c-http | 2 +- crt/aws-c-io | 2 +- crt/aws-c-sdkutils | 2 +- crt/aws-checksums | 2 +- crt/aws-lc | 2 +- crt/s2n | 2 +- tests/tests.csproj | 1 + 13 files changed, 23 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16ff50b..a075706 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,7 +68,7 @@ jobs: ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }} --spec downstream linux_mono: - runs-on: ubuntu-20.04 + runs-on: ubuntu-20.04 steps: - name: Build ${{ env.PACKAGE_NAME }} run: | @@ -94,6 +94,10 @@ jobs: matrix: arch: [x64] steps: + - name: Setup dotnet # Use setup dotnet action as Windows-2019 image no longer contains .net5.0 + uses: actions/setup-dotnet@v3 + with: + dotnet-version: '5.0.x' - uses: ilammy/msvc-dev-cmd@v1 with: arch: ${{ matrix.arch }} @@ -104,12 +108,17 @@ jobs: python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')" python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream + # TODO: Fix this to run on 14.0 toolset. Currently, it doesn't respect the toolset parameter. windows-vc14: runs-on: windows-2019 strategy: matrix: arch: [x86, x64] steps: + - name: Setup dotnet + uses: actions/setup-dotnet@v3 + with: + dotnet-version: '5.0.x' #TODO: Specify architecture to install 32 bit .net when that is supported (https://github.com/actions/setup-dotnet/issues/72) - uses: ilammy/msvc-dev-cmd@v1 with: toolset: 14.0 diff --git a/builder.json b/builder.json index e9cd42e..1d38416 100644 --- a/builder.json +++ b/builder.json @@ -55,7 +55,8 @@ "build_tests_args" : "", "run_tests_args" : "", "aws_crt_platform_target" : "x86" - } + }, + "!test_steps": [] }, "x64": { "variables": { diff --git a/crt/aws-c-auth b/crt/aws-c-auth index 59556cd..bad1066 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 59556cd46e684e5bfa27aa074caa77795ce3869f +Subproject commit bad1066f0a93f3a7df86c94cc03076fa6b901bd2 diff --git a/crt/aws-c-cal b/crt/aws-c-cal index 1458c70..ac4216b 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit 1458c70a26877345ca28e333a092096afd410774 +Subproject commit ac4216b78d5323b5b8ce95a3dd4a8fc0f95e2d33 diff --git a/crt/aws-c-common b/crt/aws-c-common index be35e65..5e64b03 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit be35e65a6c67ae2ffd126516c9783ac1dd2e8910 +Subproject commit 5e64b039356c72d17fcf1fb0bfc7637f8c2270f7 diff --git a/crt/aws-c-compression b/crt/aws-c-compression index 5fab8bc..b517b7d 160000 --- a/crt/aws-c-compression +++ b/crt/aws-c-compression @@ -1 +1 @@ -Subproject commit 5fab8bc5ab5321d86f6d153b06062419080820ec +Subproject commit b517b7decd0dac30be2162f5186c250221c53aff diff --git a/crt/aws-c-http b/crt/aws-c-http index 30230be..dd34461 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit 30230bede737dda19dc5ed2b15bb37b70aeb71e1 +Subproject commit dd34461987947672444d0bc872c5a733dfdb9711 diff --git a/crt/aws-c-io b/crt/aws-c-io index 278e588..b52181a 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit 278e5887f7408dfc1db0489d9ca4d1984b6650ef +Subproject commit b52181af655c090713fe01f14d7ccb95aab8dec5 diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils index e3c23f4..208a701 160000 --- a/crt/aws-c-sdkutils +++ b/crt/aws-c-sdkutils @@ -1 +1 @@ -Subproject commit e3c23f4aca31d9e66df25827645f72cbcbfb657a +Subproject commit 208a701fa01e99c7c8cc3dcebc8317da71362972 diff --git a/crt/aws-checksums b/crt/aws-checksums index 41df303..ad53be1 160000 --- a/crt/aws-checksums +++ b/crt/aws-checksums @@ -1 +1 @@ -Subproject commit 41df3031b92120b6d8127b7b7122391d5ac6f33f +Subproject commit ad53be196a25bbefa3700a01187fdce573a7d2d0 diff --git a/crt/aws-lc b/crt/aws-lc index 11b50d3..75a73bf 160000 --- a/crt/aws-lc +++ b/crt/aws-lc @@ -1 +1 @@ -Subproject commit 11b50d39cf2378703a4ca6b6fee9d76a2e9852d1 +Subproject commit 75a73bfabf1be384b49c7f92da6fdfd9d867069e diff --git a/crt/s2n b/crt/s2n index 8314a96..52661e9 160000 --- a/crt/s2n +++ b/crt/s2n @@ -1 +1 @@ -Subproject commit 8314a96de0c33a426ae877856a8a1a431d354e0d +Subproject commit 52661e933c99825f208f376c98a6a292b49be680 diff --git a/tests/tests.csproj b/tests/tests.csproj index 7c7ad9f..888e48f 100644 --- a/tests/tests.csproj +++ b/tests/tests.csproj @@ -27,6 +27,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all +