File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -171,7 +171,7 @@ jobs:
171171 run : |
172172 python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
173173 chmod a+x builder
174- ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream
174+ ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream --cmake-extra=-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON
175175 # check that OSX can build arm64 binaries from an x64 machine (which happens during release)
176176 - name : Cross-compile arm64
177177 run : |
@@ -217,7 +217,7 @@ jobs:
217217 run : |
218218 python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
219219 chmod a+x builder
220- ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream
220+ ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream --cmake-extra=-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON
221221 # check that OSX can build arm64 binaries from an x64 machine (which happens during release)
222222 - name : Cross-compile arm64
223223 run : |
Original file line number Diff line number Diff line change @@ -85,7 +85,7 @@ test_env.conditional_test(cRuntime !== CRuntimeType.MUSL && test_env.AWS_IOT_ENV
8585 } )
8686} ) ;
8787
88- test_env . conditional_test ( test_env . AWS_IOT_ENV . mqtt311_is_valid_pkcs12 ( ) ) ( 'Aws Iot Core PKCS12 connection' , async ( ) => {
88+ test_env . conditional_test ( test_env . AWS_IOT_ENV . mqtt311_is_valid_pkcs12 ( ) && ! ( platform ( ) === "darwin" && ! ! process . env . AWS_CRT_USE_NON_FIPS_TLS_13 ) ) ( 'Aws Iot Core PKCS12 connection' , async ( ) => {
8989 await retry . networkTimeoutRetryWrapper ( async ( ) => {
9090 let builder = aws_iot_mqtt311 . AwsIotMqttConnectionConfigBuilder . new_mtls_pkcs12_builder ( {
9191 pkcs12_file : test_env . AWS_IOT_ENV . MQTT311_PKCS12_FILE ,
@@ -373,9 +373,9 @@ test_env.conditional_test(test_env.AWS_IOT_ENV.mqtt5_is_valid_mtls_rsa())("Mqtt3
373373} ) ;
374374
375375test_env . conditional_test ( test_env . AWS_IOT_ENV . mqtt5_is_valid_mtls_rsa ( ) ) ( "Mqtt311 client builder per-platform conditional support of PQ default TlsCipherPreference" , ( ) => {
376- do_cipher_preference_test ( TlsCipherPreference . PQ_Default , platform ( ) === "linux" ) ;
376+ do_cipher_preference_test ( TlsCipherPreference . PQ_Default , platform ( ) === "linux" || ( platform ( ) === "darwin" && ! ! process . env . AWS_CRT_USE_NON_FIPS_TLS_13 ) ) ;
377377} ) ;
378378
379379test_env . conditional_test ( test_env . AWS_IOT_ENV . mqtt5_is_valid_mtls_rsa ( ) ) ( "Mqtt311 client builder per-platform conditional support of latest 1.2 policy TlsCipherPreference" , ( ) => {
380- do_cipher_preference_test ( TlsCipherPreference . TLSv1_2_2025_07 , platform ( ) === "linux" ) ;
380+ do_cipher_preference_test ( TlsCipherPreference . TLSv1_2_2025_07 , platform ( ) === "linux" || ( platform ( ) === "darwin" && ! ! process . env . AWS_CRT_USE_NON_FIPS_TLS_13 ) ) ;
381381} ) ;
Original file line number Diff line number Diff line change @@ -291,7 +291,7 @@ test_env.conditional_test(cRuntime !== CRuntimeType.MUSL && test_env.AWS_IOT_ENV
291291 } )
292292} ) ;
293293
294- test_env . conditional_test ( test_env . AWS_IOT_ENV . mqtt5_is_valid_pkcs12 ( ) ) ( 'Aws Iot Core PKCS12 - Connection Success' , async ( ) => {
294+ test_env . conditional_test ( test_env . AWS_IOT_ENV . mqtt5_is_valid_pkcs12 ( ) && ! ( platform ( ) === "darwin" && ! ! process . env . AWS_CRT_USE_NON_FIPS_TLS_13 ) ) ( 'Aws Iot Core PKCS12 - Connection Success' , async ( ) => {
295295 await retry . networkTimeoutRetryWrapper ( async ( ) => {
296296 let builder = iot . AwsIotMqtt5ClientConfigBuilder . newDirectMqttBuilderWithMtlsFromPkcs12 (
297297 test_env . AWS_IOT_ENV . MQTT5_HOST ,
@@ -352,9 +352,9 @@ test_env.conditional_test(test_env.AWS_IOT_ENV.mqtt5_is_valid_mtls_rsa())("Mqtt5
352352} ) ;
353353
354354test_env . conditional_test ( test_env . AWS_IOT_ENV . mqtt5_is_valid_mtls_rsa ( ) ) ( "Mqtt5 client builder per-platform conditional support of PQ default TlsCipherPreference" , ( ) => {
355- do_cipher_preference_test ( TlsCipherPreference . PQ_Default , platform ( ) === "linux" ) ;
355+ do_cipher_preference_test ( TlsCipherPreference . PQ_Default , platform ( ) === "linux" || ( platform ( ) === "darwin" && ! ! process . env . AWS_CRT_USE_NON_FIPS_TLS_13 ) ) ;
356356} ) ;
357357
358358test_env . conditional_test ( test_env . AWS_IOT_ENV . mqtt5_is_valid_mtls_rsa ( ) ) ( "Mqtt5 client builder per-platform conditional support of latest 1.2 policy TlsCipherPreference" , ( ) => {
359- do_cipher_preference_test ( TlsCipherPreference . TLSv1_2_2025_07 , platform ( ) === "linux" ) ;
359+ do_cipher_preference_test ( TlsCipherPreference . TLSv1_2_2025_07 , platform ( ) === "linux" || ( platform ( ) === "darwin" && ! ! process . env . AWS_CRT_USE_NON_FIPS_TLS_13 ) ) ;
360360} ) ;
Original file line number Diff line number Diff line change @@ -80,10 +80,10 @@ test("Supports default TlsCipherPreference", () => {
8080} ) ;
8181
8282test ( "Per-Platform PQ default TlsCipherPreference" , ( ) => {
83- do_cipher_preference_test ( TlsCipherPreference . PQ_Default , platform ( ) === "linux" ) ;
83+ do_cipher_preference_test ( TlsCipherPreference . PQ_Default , platform ( ) === "linux" || ( platform ( ) === "darwin" && ! ! process . env . AWS_CRT_USE_NON_FIPS_TLS_13 ) ) ;
8484} ) ;
8585
8686test ( "Per-Platform latest 1.2 policy TlsCipherPreference" , ( ) => {
87- do_cipher_preference_test ( TlsCipherPreference . TLSv1_2_2025_07 , platform ( ) === "linux" ) ;
87+ do_cipher_preference_test ( TlsCipherPreference . TLSv1_2_2025_07 , platform ( ) === "linux" || ( platform ( ) === "darwin" && ! ! process . env . AWS_CRT_USE_NON_FIPS_TLS_13 ) ) ;
8888} ) ;
8989
You can’t perform that action at this time.
0 commit comments