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.

Sign up for GitHub

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

Jump to bottom

AWS-LC-FIPS-2.0.14 & MacOS CI Update #808

Merged
merged 17 commits into from
Jul 17, 2024
Merged

AWS-LC-FIPS-2.0.14 & MacOS CI Update #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8db928f
latest submodules and ci updates
waahm7 Jul 16, 2024
1ed3dba
undo change
waahm7 Jul 16, 2024
5660963
pipx install instead pip install
waahm7 Jul 16, 2024
522e493
brew install?
waahm7 Jul 16, 2024
c446678
latest aws-lc
waahm7 Jul 16, 2024
2f99abd
back to pip install
waahm7 Jul 16, 2024
df3ec24
zero out tmp socket options
waahm7 Jul 16, 2024
590a2cb
virtual venv?
waahm7 Jul 16, 2024
e235603
try the new CI
waahm7 Jul 17, 2024
7eba6ba
Merge branch 'main' into latest-macos-ci
waahm7 Jul 17, 2024
7014192
try macos 13
waahm7 Jul 17, 2024
fc37c92
try without explicit binary
waahm7 Jul 17, 2024
a46b2b4
active profile?
waahm7 Jul 17, 2024
93bc6cb
fix macos pom.xml
waahm7 Jul 17, 2024
fe154fe
try macos xlarge
waahm7 Jul 17, 2024
4c0e4dc
try the new builder
waahm7 Jul 17, 2024
6756b45
undo temp changes
waahm7 Jul 17, 2024
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
37 changes: 13 additions & 24 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- 'docs'

env:
BUILDER_VERSION: v0.9.60
BUILDER_VERSION: v0.9.62
BUILDER_SOURCE: releases
BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
PACKAGE_NAME: aws-crt-java
Expand Down Expand Up @@ -192,8 +192,8 @@ 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 }} downstream

osx: # With integration tests
runs-on: macos-13 # latest
macos:
runs-on: macos-14 #latest
steps:
- name: Checkout Sources
uses: actions/checkout@v3
Expand All @@ -204,33 +204,20 @@ jobs:
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 }} --spec=downstream
python3 codebuild/macos_compatibility_check.py

osx-arm64:
runs-on: macos-13 # latest
macos-x64:
runs-on: macos-14-large #latest
steps:
- name: Checkout Sources
uses: actions/checkout@v3
with:
submodules: true
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
mvn -B compile -P mac-arm64
- name: verify backward compatibility
run: |
python3 codebuild/macos_compatibility_check.py armv8

osx-x64:
runs-on: macos-13
steps:
- name: Checkout Sources
uses: actions/checkout@v2
with:
submodules: true
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
mvn -B compile -P mac-x64
- name: verify backward compatibility
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 }} --spec=downstream
python3 codebuild/macos_compatibility_check.py

android:
Expand Down Expand Up @@ -328,15 +315,17 @@ jobs:
python3 -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 localhost-test -p ${{ env.PACKAGE_NAME }} --spec=downstream

localhost-test-mac:
runs-on: macos-13 # latest
localhost-test-macos:
runs-on: macos-14 # latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
submodules: true
- name: Configure local host
run: |
python3 -m venv .venv
source .venv/bin/activate
python3 -m pip install h2
cd crt/aws-c-http/tests/py_localhost/
python3 server.py &
Expand Down
2 changes: 1 addition & 1 deletion crt/aws-c-cal
Open in desktop
Submodule aws-c-cal updated 12 files
+11 −2 .github/workflows/ci.yml
+17 −1 builder.json
+47 −0 source/unix/openssl_platform_init.c
+50 −0 tests/aes256_test.c
+46 −0 tests/der_test.c
+20 −13 tests/ecc_test.c
+5 −5 tests/md5_test.c
+16 −14 tests/rsa_test.c
+8 −8 tests/sha1_test.c
+5 −5 tests/sha256_hmac_test.c
+8 −8 tests/sha256_test.c
+35 −2 tests/test_case_helper.h
2 changes: 1 addition & 1 deletion crt/aws-c-http
Open in desktop
Submodule aws-c-http updated 22 files
+1 −1 .github/workflows/ci.yml
+4 −6 .github/workflows/clang-format.yml
+47 −0 format-check.py
+0 −24 format-check.sh
+4 −1 include/aws/http/connection.h
+14 −0 include/aws/http/connection_manager.h
+3 −1 include/aws/http/private/h2_frames.h
+7 −7 include/aws/http/proxy.h
+3 −1 include/aws/http/request_response.h
+9 −4 include/aws/http/server.h
+61 −1 source/connection_manager.c
+1 −1 source/http.c
+1 −0 tests/CMakeLists.txt
+48 −0 tests/test_connection_manager.c
+5 −5 tests/test_h1_client.c
+4 −1 tests/test_h2_client.c
+2 −1 tests/test_h2_encoder.c
+2 −1 tests/test_h2_headers.c
+4 −1 tests/test_localhost_integ.c
+4 −1 tests/test_message.c
+4 −1 tests/test_stream_manager.c
+3 −1 tests/test_websocket_handler.c
2 changes: 1 addition & 1 deletion crt/aws-c-io
Open in desktop
Submodule aws-c-io updated 23 files
+11 −3 .github/workflows/ci.yml
+4 −6 .github/workflows/clang-format.yml
+47 −0 format-check.py
+0 −24 format-check.sh
+2 −2 include/aws/io/channel.h
+3 −4 include/aws/io/channel_bootstrap.h
+3 −4 include/aws/io/event_loop.h
+13 −0 include/aws/io/socket.h
+4 −5 include/aws/io/tls_channel_handler.h
+11 −18 source/channel.c
+3 −8 source/darwin/secure_transport_tls_channel_handler.c
+1 −1 source/io.c
+2 −5 source/message_pool.c
+91 −2 source/posix/socket.c
+2 −4 source/s2n/s2n_tls_channel_handler.c
+0 −5 source/socket_channel_handler.c
+1 −1 source/windows/iocp/iocp_event_loop.c
+19 −0 source/windows/iocp/socket.c
+124 −120 source/windows/secure_channel_tls_handler.c
+2 −0 tests/CMakeLists.txt
+1 −1 tests/socket_handler_test.c
+82 −7 tests/socket_test.c
+27 −13 tests/tls_handler_test.c
2 changes: 1 addition & 1 deletion crt/aws-c-s3
Open in desktop
Submodule aws-c-s3 updated 11 files
+1 −1 .github/workflows/ci.yml
+17 −0 include/aws/s3/private/s3_client_impl.h
+25 −10 include/aws/s3/s3_client.h
+1 −0 source/s3.c
+48 −1 source/s3_client.c
+11 −3 source/s3_endpoint.c
+2 −0 tests/CMakeLists.txt
+60 −0 tests/s3_mock_server_tests.c
+5 −1 tests/s3_tester.c
+2 −0 tests/s3_tester.h
+14 −0 tests/s3_util_tests.c
2 changes: 1 addition & 1 deletion crt/aws-lc
Open in desktop
Submodule aws-lc updated from c166b1 to 533fb6
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<activation>
<os>
<family>mac</family>
<arch>arm64</arch>
<arch>aarch64</arch>
</os>
</activation>
<properties>
Expand Down
1 change: 1 addition & 0 deletions src/native/mqtt5_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1772,6 +1772,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_mqtt5_Mqtt5Client_mqtt5C

struct aws_socket_options *socket_options = NULL;
struct aws_socket_options tmp_socket_options;
AWS_ZERO_STRUCT(tmp_socket_options);
jobject jni_socket_options =
(*env)->CallObjectMethod(env, jni_options, mqtt5_client_options_properties.options_get_socket_options_id);
if (aws_jni_check_and_clear_exception(env)) {
Expand Down
Loading