Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
19 changes: 15 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'main'

env:
BUILDER_VERSION: v0.9.16
BUILDER_VERSION: v0.9.25
BUILDER_SOURCE: releases
BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
PACKAGE_NAME: aws-c-io
Expand Down Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Build ${{ env.PACKAGE_NAME }}
run: |
aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} downstream
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }}

linux-byo-crypto:
runs-on: ubuntu-20.04 # latest
Expand Down Expand Up @@ -90,6 +90,17 @@ jobs:
aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBUILD_SHARED_LIBS=ON

# Test downstream repos.
# This should not be required because we can run into a chicken and egg problem if there is a change that needs some fix in a downstream repo.
downstream:
runs-on: ubuntu-20.04 # latest
steps:
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
- name: Build ${{ env.PACKAGE_NAME }}
run: |
aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build downstream -p ${{ env.PACKAGE_NAME }}

windows:
runs-on: windows-2022 # latest
steps:
Expand Down Expand Up @@ -129,10 +140,10 @@ jobs:
python .\aws-c-io\build\deps\aws-c-common\scripts\appverifier_ctest.py --build_directory .\aws-c-io\build\aws-c-io

osx:
runs-on: macos-11 # latest
runs-on: macos-12 # latest
steps:
- 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')"
chmod a+x builder
./builder build -p ${{ env.PACKAGE_NAME }} downstream
./builder build -p ${{ env.PACKAGE_NAME }}
3 changes: 2 additions & 1 deletion builder.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
],
"downstream": [
{ "name": "aws-c-mqtt" },
{ "name": "aws-c-http" }
{ "name": "aws-c-http" },
Copy link
Contributor

Choose a reason for hiding this comment

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

let's put HTTP before MQTT, since MQTT sometimes uses HTTP

{ "name": "aws-c-event-stream" }
],
"targets": {
"linux": {
Expand Down
2 changes: 1 addition & 1 deletion include/aws/io/channel_bootstrap.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ struct aws_client_bootstrap_options {
/* Optional. If none is provided then default settings are used.
* This object is deep-copied by bootstrap.
* */
struct aws_host_resolution_config *host_resolution_config;
const struct aws_host_resolution_config *host_resolution_config;
Copy link
Contributor

Choose a reason for hiding this comment

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

👍


/* Optional. If provided, callback is invoked when client bootstrap has completely shut down. */
aws_client_bootstrap_shutdown_complete_fn *on_shutdown_complete;
Expand Down
4 changes: 2 additions & 2 deletions include/aws/io/host_resolver.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ struct aws_host_resolver_vtable {
struct aws_host_resolver *resolver,
const struct aws_string *host_name,
aws_on_host_resolved_result_fn *res,
struct aws_host_resolution_config *config,
const struct aws_host_resolution_config *config,
void *user_data);
/** gives your implementation a hint that an address has some failed connections occuring. Do whatever you want (or
* nothing) about it.
Expand Down Expand Up @@ -204,7 +204,7 @@ AWS_IO_API int aws_host_resolver_resolve_host(
struct aws_host_resolver *resolver,
const struct aws_string *host_name,
aws_on_host_resolved_result_fn *res,
struct aws_host_resolution_config *config,
const struct aws_host_resolution_config *config,
void *user_data);

/**
Expand Down
6 changes: 3 additions & 3 deletions source/host_resolver.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ int aws_host_resolver_resolve_host(
struct aws_host_resolver *resolver,
const struct aws_string *host_name,
aws_on_host_resolved_result_fn *res,
struct aws_host_resolution_config *config,
const struct aws_host_resolution_config *config,
void *user_data) {
AWS_ASSERT(resolver->vtable && resolver->vtable->resolve_host);
return resolver->vtable->resolve_host(resolver, host_name, res, config, user_data);
Expand Down Expand Up @@ -1252,7 +1252,7 @@ static inline int create_and_init_host_entry(
struct aws_host_resolver *resolver,
const struct aws_string *host_name,
aws_on_host_resolved_result_fn *res,
struct aws_host_resolution_config *config,
const struct aws_host_resolution_config *config,
uint64_t timestamp,
void *user_data) {
struct host_entry *new_host_entry = aws_mem_calloc(resolver->allocator, 1, sizeof(struct host_entry));
Expand Down Expand Up @@ -1381,7 +1381,7 @@ static int default_resolve_host(
struct aws_host_resolver *resolver,
const struct aws_string *host_name,
aws_on_host_resolved_result_fn *res,
struct aws_host_resolution_config *config,
const struct aws_host_resolution_config *config,
void *user_data) {
int result = AWS_OP_SUCCESS;

Expand Down