From 7a2df5b16f1c8917baf4c5a70189a5563771a9fa Mon Sep 17 00:00:00 2001 From: Dengke Tang Date: Mon, 16 Oct 2023 11:02:20 -0700 Subject: [PATCH] update submodules (#98) Fix sigv4a on MacOS 14+ --- .github/workflows/ci.yml | 19 +++++++++++++------ 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 +- 11 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 545c9b0..eeb5cc7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,7 +97,9 @@ jobs: - 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' + dotnet-version: | + 3.1.x + 5.0.x - uses: ilammy/msvc-dev-cmd@v1 with: arch: ${{ matrix.arch }} @@ -118,7 +120,10 @@ jobs: - 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) + #TODO: Specify architecture to install 32 bit .net when that is supported (https://github.com/actions/setup-dotnet/issues/72) + dotnet-version: | + 3.1.x + 5.0.x - uses: ilammy/msvc-dev-cmd@v1 with: toolset: 14.0 @@ -131,12 +136,14 @@ jobs: python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14 downstream osx: - runs-on: macos-11 + runs-on: macos-12 steps: - - name: Setup dotnet # Use setup dotnet action as macos-11 image no longer contains .net5.0 + - name: Setup dotnet # Use setup dotnet action as macos-12 image no longer contains .net5.0 and .net3.1 uses: actions/setup-dotnet@v3 with: - dotnet-version: '5.0.x' + dotnet-version: | + 3.1.x + 5.0.x - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')" @@ -147,7 +154,7 @@ jobs: # it would be better to run tests natively on one of these machines, # but we don't have access to one in the cloud, so for now just cross-compile osx-arm64-cross-compile: - runs-on: macos-11 + runs-on: macos-12 steps: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | diff --git a/crt/aws-c-auth b/crt/aws-c-auth index bad1066..c75e008 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit bad1066f0a93f3a7df86c94cc03076fa6b901bd2 +Subproject commit c75e00804da02fef8275b29509bd7180cb7e4667 diff --git a/crt/aws-c-cal b/crt/aws-c-cal index ac4216b..a916a84 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit ac4216b78d5323b5b8ce95a3dd4a8fc0f95e2d33 +Subproject commit a916a84ec07d028fa7d8c09d4aecaa81df7e8a23 diff --git a/crt/aws-c-common b/crt/aws-c-common index 5e64b03..4c0a9f5 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 5e64b039356c72d17fcf1fb0bfc7637f8c2270f7 +Subproject commit 4c0a9f579d3064f086b42a2d39aaea721e7e71ca diff --git a/crt/aws-c-compression b/crt/aws-c-compression index b517b7d..99ec79e 160000 --- a/crt/aws-c-compression +++ b/crt/aws-c-compression @@ -1 +1 @@ -Subproject commit b517b7decd0dac30be2162f5186c250221c53aff +Subproject commit 99ec79ee2970f1a045d4ced1501b97ee521f2f85 diff --git a/crt/aws-c-http b/crt/aws-c-http index dd34461..d777859 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit dd34461987947672444d0bc872c5a733dfdb9711 +Subproject commit d777859b6da179b9098f87a2077fbf2129b574dc diff --git a/crt/aws-c-io b/crt/aws-c-io index b52181a..c9cb777 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit b52181af655c090713fe01f14d7ccb95aab8dec5 +Subproject commit c9cb77747d3fd2809cf3d9c43be7d5decc17e4b3 diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils index 208a701..a6fd80c 160000 --- a/crt/aws-c-sdkutils +++ b/crt/aws-c-sdkutils @@ -1 +1 @@ -Subproject commit 208a701fa01e99c7c8cc3dcebc8317da71362972 +Subproject commit a6fd80cf7c163062d31abb28f309e47330fbfc17 diff --git a/crt/aws-checksums b/crt/aws-checksums index ad53be1..321b805 160000 --- a/crt/aws-checksums +++ b/crt/aws-checksums @@ -1 +1 @@ -Subproject commit ad53be196a25bbefa3700a01187fdce573a7d2d0 +Subproject commit 321b805559c8e911be5bddba13fcbd222a3e2d3a diff --git a/crt/aws-lc b/crt/aws-lc index 75a73bf..e42a4ef 160000 --- a/crt/aws-lc +++ b/crt/aws-lc @@ -1 +1 @@ -Subproject commit 75a73bfabf1be384b49c7f92da6fdfd9d867069e +Subproject commit e42a4ef2270c4873e98101098edd1f0aaece966d diff --git a/crt/s2n b/crt/s2n index a58b308..4654fec 160000 --- a/crt/s2n +++ b/crt/s2n @@ -1 +1 @@ -Subproject commit a58b308637e736f7024ad45aed8c63a51a267e6c +Subproject commit 4654fecb05cd5aacbda262654eb95a3876183698