Skip to content

Commit 42e5c0a

Browse files
authored
Update submodules (#89)
1 parent 2e6c8bf commit 42e5c0a

File tree

13 files changed

+23
-12
lines changed

13 files changed

+23
-12
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }} --spec downstream
6969
7070
linux_mono:
71-
runs-on: ubuntu-20.04
71+
runs-on: ubuntu-20.04
7272
steps:
7373
- name: Build ${{ env.PACKAGE_NAME }}
7474
run: |
@@ -94,6 +94,10 @@ jobs:
9494
matrix:
9595
arch: [x64]
9696
steps:
97+
- name: Setup dotnet # Use setup dotnet action as Windows-2019 image no longer contains .net5.0
98+
uses: actions/setup-dotnet@v3
99+
with:
100+
dotnet-version: '5.0.x'
97101
- uses: ilammy/msvc-dev-cmd@v1
98102
with:
99103
arch: ${{ matrix.arch }}
@@ -104,12 +108,17 @@ jobs:
104108
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
105109
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream
106110
111+
# TODO: Fix this to run on 14.0 toolset. Currently, it doesn't respect the toolset parameter.
107112
windows-vc14:
108113
runs-on: windows-2019
109114
strategy:
110115
matrix:
111116
arch: [x86, x64]
112117
steps:
118+
- name: Setup dotnet
119+
uses: actions/setup-dotnet@v3
120+
with:
121+
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)
113122
- uses: ilammy/msvc-dev-cmd@v1
114123
with:
115124
toolset: 14.0

builder.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
"build_tests_args" : "",
5656
"run_tests_args" : "",
5757
"aws_crt_platform_target" : "x86"
58-
}
58+
},
59+
"!test_steps": []
5960
},
6061
"x64": {
6162
"variables": {

crt/aws-c-common

Submodule aws-c-common updated 73 files

crt/aws-c-http

Submodule aws-c-http updated 61 files

crt/aws-c-sdkutils

Submodule aws-c-sdkutils updated 56 files

0 commit comments

Comments
 (0)