Skip to content

Commit 0c7b8b5

Browse files
authored
Update CI (#396)
1 parent 971161e commit 0c7b8b5

File tree

4 files changed

+20
-8
lines changed

4 files changed

+20
-8
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'main'
77

88
env:
9-
BUILDER_VERSION: v0.9.18
9+
BUILDER_VERSION: v0.9.26
1010
BUILDER_SOURCE: releases
1111
BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
1212
PACKAGE_NAME: aws-c-http
@@ -36,7 +36,7 @@ jobs:
3636
- name: Build ${{ env.PACKAGE_NAME }}
3737
run: |
3838
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
39-
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build downstream -p ${{ env.PACKAGE_NAME }}
39+
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }}
4040
4141
linux-compiler-compat:
4242
runs-on: ubuntu-20.04 # latest
@@ -59,7 +59,7 @@ jobs:
5959
- name: Build ${{ env.PACKAGE_NAME }}
6060
run: |
6161
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
62-
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build downstream -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }}
62+
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }}
6363
6464
clang-sanitizers:
6565
runs-on: ubuntu-20.04 # latest
@@ -91,6 +91,17 @@ jobs:
9191
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
9292
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON
9393
94+
# Test downstream repos.
95+
# 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.
96+
downstream:
97+
runs-on: ubuntu-20.04 # latest
98+
steps:
99+
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
100+
- name: Build ${{ env.PACKAGE_NAME }}
101+
run: |
102+
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
103+
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build downstream -p ${{ env.PACKAGE_NAME }}
104+
94105
windows:
95106
runs-on: windows-2022 # latest
96107
steps:
@@ -130,13 +141,13 @@ jobs:
130141
python .\aws-c-http\build\deps\aws-c-common\scripts\appverifier_ctest.py --build_directory .\aws-c-http\build\aws-c-http
131142
132143
osx:
133-
runs-on: macos-11 # latest
144+
runs-on: macos-12 # latest
134145
steps:
135146
- name: Build ${{ env.PACKAGE_NAME }} + consumers
136147
run: |
137148
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
138149
chmod a+x builder
139-
./builder build downstream -p ${{ env.PACKAGE_NAME }}
150+
./builder build -p ${{ env.PACKAGE_NAME }}
140151
141152
142153
localhost-test-linux:

builder.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
],
1313
"downstream": [
1414
{ "name": "aws-c-auth" },
15-
{ "name": "aws-c-mqtt" }
15+
{ "name": "aws-c-mqtt" },
16+
{ "name": "aws-c-s3" }
1617
],
1718
"test_steps": [
1819
"aws-c-http-test",

include/aws/http/connection_manager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void aws_http_connection_manager_release(struct aws_http_connection_manager *man
152152
AWS_HTTP_API
153153
struct aws_http_connection_manager *aws_http_connection_manager_new(
154154
struct aws_allocator *allocator,
155-
struct aws_http_connection_manager_options *options);
155+
const struct aws_http_connection_manager_options *options);
156156

157157
/*
158158
* Requests a connection from the manager. The requester is notified of

source/connection_manager.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ static void s_schedule_connection_culling(struct aws_http_connection_manager *ma
790790

791791
struct aws_http_connection_manager *aws_http_connection_manager_new(
792792
struct aws_allocator *allocator,
793-
struct aws_http_connection_manager_options *options) {
793+
const struct aws_http_connection_manager_options *options) {
794794

795795
aws_http_fatal_assert_library_initialized();
796796

0 commit comments

Comments
 (0)