Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update submodules #89

Merged
merged 36 commits into from
Jan 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
b4a6ce6
test change
waahm7 Jan 24, 2023
3dcf78b
use dot version
waahm7 Jan 24, 2023
ab91d28
fix uses
waahm7 Jan 24, 2023
565f33c
separate CI
waahm7 Jan 24, 2023
ad641c6
test another action
waahm7 Jan 24, 2023
69d34b7
reset
waahm7 Jan 24, 2023
ecfb490
update
waahm7 Jan 24, 2023
85e8706
test
waahm7 Jan 25, 2023
1d72604
fix tab
waahm7 Jan 25, 2023
6af507a
remove checkout
waahm7 Jan 25, 2023
8b2452f
remove dev cmd
waahm7 Jan 25, 2023
e5ee196
add vs version
waahm7 Jan 25, 2023
8b7f5ff
add global json
waahm7 Jan 25, 2023
270e7df
use vs 2015
waahm7 Jan 25, 2023
7d806d9
add net5.0
waahm7 Jan 25, 2023
46bd983
remove tests
waahm7 Jan 25, 2023
1a58640
force version 5.0
waahm7 Jan 25, 2023
7dfa2d6
remove args
waahm7 Jan 25, 2023
c9827ac
update version
waahm7 Jan 25, 2023
fefca3f
include tests
waahm7 Jan 25, 2023
ab2493a
reset CI
waahm7 Jan 25, 2023
6185d44
reset builder.json , setup dotnet step
waahm7 Jan 25, 2023
91a5197
add comment
waahm7 Jan 25, 2023
21a0895
remove checkout source action
waahm7 Jan 25, 2023
f00dfc0
latest submodules
waahm7 Jan 25, 2023
c7040c3
include ms test framework & adapter
waahm7 Jan 25, 2023
da42027
fix typo
waahm7 Jan 25, 2023
5dbcc56
add visual studio
waahm7 Jan 25, 2023
1e821f0
reset builder.json
waahm7 Jan 25, 2023
02d54b8
add comment and use vsversion property
waahm7 Jan 25, 2023
bd2022e
remove msvc dev
waahm7 Jan 25, 2023
41b9b25
re add msvc
waahm7 Jan 25, 2023
759548c
remove target
waahm7 Jan 25, 2023
ca78391
readd arch
waahm7 Jan 25, 2023
d817d11
disable tests for 32 bit
waahm7 Jan 25, 2023
9d900fb
Add todo
waahm7 Jan 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not your fault, but

ilammy/msvc-dev-cmd <-- in my experience, this github action has no effect

it ended up in all our ci.yml files when we were first setting up our repos and copy/pasting everything

later we discovered it had no effect, but we've never made a concerted effort to fix this across our 20+ repos :(

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

with:
arch: ${{ matrix.arch }}
Expand All @@ -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:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not your fault, but this "windows-vc14" run isn't doing what it claims.

vc14 means version 14.0 of the compiler, aka toolset 140, which came with Visual Studio 2015, but you can still use those older toolset versions with later versions of Visual Studio

but it's actually just using the default compiler on this machine, which is Visual Studio 2019's version 14.29

Here's the line in the logs where you see what it's actually using.

-- Check for working C compiler: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x86/cl.exe

and then you cross-reference that against the Wikipedia page that details what the hell those version numbers mean. And you see that 14.29 means it's the latest build Visual Studio 2019 compiler

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a TODO for now.

- 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
Expand Down
3 changes: 2 additions & 1 deletion builder.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
"build_tests_args" : "",
"run_tests_args" : "",
"aws_crt_platform_target" : "x86"
}
},
"!test_steps": []
},
"x64": {
"variables": {
Expand Down
2 changes: 1 addition & 1 deletion crt/aws-c-auth
2 changes: 1 addition & 1 deletion crt/aws-c-common
Submodule aws-c-common updated 73 files
+28 −5 .github/workflows/ci.yml
+3 −3 .github/workflows/clang-format.yml
+1 −1 .github/workflows/clang-tidy.yml
+25 −0 .github/workflows/codecov.yml
+2 −0 .gitignore
+0 −0 .gitmodules
+3 −0 CMakeLists.txt
+3 −2 builder.json
+13 −0 cmake/AwsCFlags.cmake
+32 −0 cmake/AwsCRuntime.cmake
+1 −0 cmake/AwsFeatureTests.cmake
+59 −0 cmake/AwsThreadName.cmake
+15 −3 cmake/aws-c-common-config.cmake
+6 −0 include/aws/common/allocator.h
+13 −7 include/aws/common/assert.h
+1 −1 include/aws/common/bus.h
+19 −8 include/aws/common/byte_buf.h
+3 −3 include/aws/common/command_line_parser.h
+2 −2 include/aws/common/common.h
+34 −1 include/aws/common/encoding.h
+5 −1 include/aws/common/error.h
+4 −1 include/aws/common/file.h
+83 −3 include/aws/common/json.h
+1 −0 include/aws/common/linked_hash_table.h
+19 −3 include/aws/common/logging.h
+2 −2 include/aws/common/macros.h
+1 −1 include/aws/common/private/hash_table_impl.h
+16 −2 include/aws/common/thread.h
+162 −0 include/aws/common/uri.h
+8 −5 include/aws/testing/aws_test_harness.h
+99 −0 scripts/appverifier_ctest.py
+266 −0 scripts/appverifier_xml.py
+1 −1 source/allocator.c
+5 −0 source/allocator_sba.c
+2 −1 source/array_list.c
+1 −1 source/bus.c
+4 −6 source/command_line_parser.c
+13 −1 source/common.c
+1 −1 source/date_time.c
+117 −5 source/encoding.c
+4 −0 source/error.c
+17 −12 source/file.c
+104 −19 source/json.c
+23 −0 source/linked_hash_table.c
+18 −4 source/log_channel.c
+3 −2 source/log_writer.c
+18 −1 source/logging.c
+4 −4 source/memtrace.c
+63 −39 source/posix/file.c
+2 −2 source/posix/system_info.c
+75 −35 source/posix/thread.c
+6 −4 source/priority_queue.c
+596 −0 source/uri.c
+5 −3 source/uuid.c
+23 −5 source/windows/file.c
+4 −4 source/windows/system_info.c
+19 −3 source/windows/thread.c
+6 −6 source/xml_parser.c
+29 −0 tests/CMakeLists.txt
+36 −8 tests/alloc_test.c
+262 −0 tests/encoding_test.c
+131 −0 tests/json_test.c
+135 −0 tests/linked_hash_table_test.c
+6 −4 tests/logging/log_channel_test.c
+47 −0 tests/split_test.c
+3 −0 tests/thread_test.c
+887 −0 tests/uri_test.c
+3 −0 tests/zero_test.c
+1 −1 verification/cbmc/proofs/aws_priority_queue_s_sift_down/aws_priority_queue_s_sift_down_harness.c
+1 −1 verification/cbmc/proofs/aws_priority_queue_s_sift_up/aws_priority_queue_s_sift_up_harness.c
+1 −0 verification/cbmc/stubs/memset_override_0.c
+4 −0 verification/cbmc/stubs/s_expand_table_override.c
+1 −3 verification/cbmc/stubs/s_sift_either_override.c
2 changes: 1 addition & 1 deletion crt/aws-c-http
Submodule aws-c-http updated 61 files
+2 −0 .builder/action/aws-c-http-test.py
+46 −0 .builder/action/local-server-setup.py
+27 −23 .github/workflows/ci.yml
+1 −0 .gitignore
+7 −2 bin/elasticurl/main.c
+3 −1 builder.json
+15 −3 cmake/aws-c-http-config.cmake
+3 −3 codebuild/linux-integration-tests.yml
+10 −3 include/aws/http/connection.h
+4 −2 include/aws/http/connection_manager.h
+1 −0 include/aws/http/http.h
+2 −2 include/aws/http/http2_stream_manager.h
+2 −1 include/aws/http/private/h2_frames.h
+187 −54 include/aws/http/private/hpack.h
+7 −1 include/aws/http/private/proxy_impl.h
+1 −0 include/aws/http/private/request_response_impl.h
+11 −2 include/aws/http/private/websocket_decoder.h
+1 −0 include/aws/http/private/websocket_impl.h
+36 −5 include/aws/http/request_response.h
+91 −50 include/aws/http/websocket.h
+2 −2 integration-testing/http_client_test.py
+25 −17 source/connection.c
+3 −2 source/connection_manager.c
+1 −39 source/h1_decoder.c
+7 −3 source/h1_stream.c
+2 −2 source/h2_connection.c
+13 −16 source/h2_decoder.c
+4 −9 source/h2_frames.c
+8 −7 source/h2_stream.c
+31 −977 source/hpack.c
+446 −0 source/hpack_decoder.c
+418 −0 source/hpack_encoder.c
+3 −0 source/http.c
+12 −2 source/http2_stream_manager.c
+108 −41 source/proxy_connection.c
+63 −7 source/request_response.c
+186 −112 source/websocket.c
+449 −136 source/websocket_bootstrap.c
+70 −15 source/websocket_decoder.c
+24 −3 source/websocket_encoder.c
+31 −6 tests/CMakeLists.txt
+2 −2 tests/fuzz/fuzz_h2_decoder_correct.c
+3 −0 tests/h2_test_helper.c
+4 −4 tests/py_localhost/README.md
+1 −1 tests/py_localhost/non_tls_server.py
+1 −1 tests/py_localhost/server.py
+9 −0 tests/stream_test_helper.c
+2 −0 tests/stream_test_helper.h
+65 −10 tests/test_connection.c
+73 −13 tests/test_connection_manager.c
+1 −5 tests/test_connection_monitor.c
+79 −0 tests/test_h1_client.c
+156 −2 tests/test_h2_client.c
+32 −36 tests/test_h2_headers.c
+85 −86 tests/test_hpack.c
+4 −8 tests/test_localhost_integ.c
+62 −1 tests/test_message.c
+38 −24 tests/test_stream_manager.c
+622 −97 tests/test_websocket_bootstrap.c
+220 −6 tests/test_websocket_decoder.c
+180 −94 tests/test_websocket_handler.c
2 changes: 1 addition & 1 deletion crt/aws-c-io
2 changes: 1 addition & 1 deletion crt/aws-c-sdkutils
Submodule aws-c-sdkutils updated 56 files
+30 −9 .github/workflows/ci.yml
+4 −1 CMakeLists.txt
+21 −9 README.md
+3 −0 builder.json
+15 −2 cmake/aws-c-sdkutils-config.cmake
+303 −0 include/aws/sdkutils/endpoints_rule_engine.h
+38 −0 include/aws/sdkutils/partitions.h
+314 −0 include/aws/sdkutils/private/endpoints_types_impl.h
+136 −0 include/aws/sdkutils/private/endpoints_util.h
+12 −0 include/aws/sdkutils/sdkutils.h
+1,132 −0 source/endpoints_rule_engine.c
+958 −0 source/endpoints_ruleset.c
+639 −0 source/endpoints_standard_lib.c
+235 −0 source/endpoints_types_impl.c
+588 −0 source/endpoints_util.c
+283 −0 source/partitions.c
+1 −1 source/resource_name.c
+11 −0 source/sdkutils.c
+27 −0 tests/CMakeLists.txt
+477 −0 tests/endpoints_rule_engine_tests.c
+181 −0 tests/endpoints_util_tests.c
+0 −7 tests/resource_name_tests.c
+101 −0 tests/resources/partitions.json
+45 −0 tests/resources/sample_partitions.json
+41 −0 tests/resources/sample_ruleset.json
+33 −0 tests/resources/test-cases/aws-region.json
+15 −0 tests/resources/test-cases/custom_object_condition.json
+45 −0 tests/resources/test-cases/default-values.json
+48 −0 tests/resources/test-cases/eventbridge.json
+50 −0 tests/resources/test-cases/fns.json
+25 −0 tests/resources/test-cases/headers.json
+148 −0 tests/resources/test-cases/is-virtual-hostable-s3-bucket.json
+27 −0 tests/resources/test-cases/local-region-override.json
+152 −0 tests/resources/test-cases/parse-arn.json
+153 −0 tests/resources/test-cases/parse-url.json
+125 −0 tests/resources/test-cases/partition-fn.json
+185 −0 tests/resources/test-cases/substring.json
+75 −0 tests/resources/test-cases/uri-encode.json
+56 −0 tests/resources/test-cases/valid-hostlabel.json
+44 −0 tests/resources/valid-rules/aws-region.json
+32 −0 tests/resources/valid-rules/custom_object_condition.json
+44 −0 tests/resources/valid-rules/default-values.json
+41 −0 tests/resources/valid-rules/deprecated-param.json
+323 −0 tests/resources/valid-rules/eventbridge.json
+128 −0 tests/resources/valid-rules/fns.json
+46 −0 tests/resources/valid-rules/get-attr-type-inference.json
+44 −0 tests/resources/valid-rules/headers.json
+48 −0 tests/resources/valid-rules/is-virtual-hostable-s3-bucket.json
+29 −0 tests/resources/valid-rules/minimal-ruleset.json
+251 −0 tests/resources/valid-rules/parse-arn.json
+102 −0 tests/resources/valid-rules/parse-url.json
+101 −0 tests/resources/valid-rules/partition-fn.json
+36 −0 tests/resources/valid-rules/region-override.json
+95 −0 tests/resources/valid-rules/substring.json
+44 −0 tests/resources/valid-rules/uri-encode.json
+55 −0 tests/resources/valid-rules/valid-hostlabel.json
2 changes: 1 addition & 1 deletion crt/aws-lc
2 changes: 1 addition & 1 deletion crt/s2n
Submodule s2n updated from 8314a9 to 52661e
1 change: 1 addition & 0 deletions tests/tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
</ItemGroup>

<ItemGroup>
Expand Down