awslabs · graebm · May 23, 2022 · Apr 29, 2022 · Apr 29, 2022 · May 2, 2022
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -135,6 +135,17 @@ jobs:
           chmod a+x builder
           ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream
 
+  osx-arm64:
+    runs-on: macos-11 # latest
+    steps:
+      - name: Checkout Sources
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Build ${{ env.PACKAGE_NAME }} + consumers
+        run: |
+          mvn -B compile -P mac-arm64
+
   android:
     name: Android
     # ubuntu-20.04 comes with Android tooling, see: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md#android

diff --git a/.gitignore b/.gitignore
@@ -91,3 +91,5 @@ settings.xml
 
 # docs are updated automatically by .github/workflows/docs.yml
 docs/
+
+bin/
diff --git a/codebuild/cd/deploy-snapshot.yml b/codebuild/cd/deploy-snapshot.yml
@@ -27,6 +27,7 @@ phases:
       - cp -rv $CODEBUILD_SRC_DIR_linux_x64/dist/* $CODEBUILD_SRC_DIR/aws-crt-java/target/cmake-build/
       - cp -rv $CODEBUILD_SRC_DIR_linux_x86/dist/* $CODEBUILD_SRC_DIR/aws-crt-java/target/cmake-build/
       - cp -rv $CODEBUILD_SRC_DIR_osx_x64/* $CODEBUILD_SRC_DIR/aws-crt-java/target/cmake-build/
+      - cp -rv $CODEBUILD_SRC_DIR_osx_arm64/* $CODEBUILD_SRC_DIR/aws-crt-java/target/cmake-build/
       - ls -alR $CODEBUILD_SRC_DIR/aws-crt-java/target/cmake-build/lib
       # install settings.xml to ~/.m2/settings.xml
       - mkdir -p $HOME/.m2

diff --git a/codebuild/cd/osx-arm64-build.sh b/codebuild/cd/osx-arm64-build.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -ex
+
+cd `dirname $0`/../..
+
+git submodule update --init
+
+mvn -B compile -P mac-arm64
+
+# Copy artifacts to dist
+mkdir -p ../dist
+cp -rv target/cmake-build/lib ../dist/
diff --git a/codebuild/cd/osx-x64-build.sh b/codebuild/cd/osx-x64-build.sh
@@ -6,7 +6,7 @@ cd `dirname $0`/../..
 
 git submodule update --init
 
-mvn -B compile
+mvn -B compile -P mac-x64
 
 # Copy artifacts to dist
 mkdir -p ../dist

diff --git a/crt/aws-c-http b/crt/aws-c-http
diff --git a/pom.xml b/pom.xml
@@ -41,6 +41,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <cmake.warningsareerrors>OFF</cmake.warningsareerrors>
         <cmake.s2nNoPqAsm>OFF</cmake.s2nNoPqAsm>
+        <cmake.osx_arch>-DOSX_ARCH_DUMMY=1</cmake.osx_arch>
     </properties>
 
     <profiles>
@@ -89,14 +90,28 @@
             </properties>
         </profile>
         <profile>
-            <id>mac-make</id>
+            <id>mac-x64</id>
             <activation>
                 <os>
                     <family>mac</family>
+                    <arch>x86_64</arch>
                 </os>
             </activation>
             <properties>
                 <cmake.cflags/>
+                <cmake.osx_arch>-DCMAKE_OSX_ARCHITECTURES=x86_64</cmake.osx_arch>
+            </properties>
+        </profile>
+        <profile>
+            <id>mac-arm64</id>
+                <activation>
+                    <os>
+                        <family>mac</family>
+                        <arch>arm64</arch>
+                    </os>
+                </activation>
+            <properties>
+                <cmake.osx_arch>-DCMAKE_OSX_ARCHITECTURES=arm64</cmake.osx_arch>
             </properties>
         </profile>
         <!-- 32-bit Unix -->
@@ -159,9 +174,10 @@
                                         <argument>-DCMAKE_PREFIX_PATH=${cmake.binaries}/install</argument>
                                         <argument>-DCMAKE_INSTALL_PREFIX=${cmake.binaries}/install</argument>
                                         <argument>-DCMAKE_C_FLAGS=${cmake.cflags}</argument>
+                                        <argument>${cmake.osx_arch}</argument>
                                         <argument>-DS2N_NO_PQ_ASM=${cmake.s2nNoPqAsm}</argument>
                                         <argument>-DBUILD_TESTING=OFF</argument>
-                                        <argument>-Wno-unused-variables</argument>
+                                        <argument>--no-warn-unused-cli</argument>
                                         <argument>${cmake.generator}</argument>
                                         <argument>${cmake.toolset}</argument>
                                     </arguments>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -91,3 +91,5 @@ settings.xml

		# docs are updated automatically by .github/workflows/docs.yml
		docs/

		bin/
+37 −0		.builder/action/aws-c-http-test.py
+0 −19		.builder/action/aws-c-http-test.sh
+49 −0		.github/workflows/ci.yml
+1 −0		CMakeLists.txt
+8 −0		README.md
+2 −2		builder.json
+25 −0		include/aws/http/connection_manager.h
+12 −0		include/aws/http/http2_stream_manager.h
+10 −3		include/aws/http/private/random_access_set.h
+1 −0		source/connection.c
+12 −0		source/connection_manager.c
+3 −4		source/h2_stream.c
+35 −10		source/http2_stream_manager.c
+9 −3		source/random_access_set.c
+20 −1		tests/CMakeLists.txt
+114 −0		tests/h2_test_helper.c
+6 −0		tests/h2_test_helper.h
+36 −0		tests/py_localhost/README.md
+56 −0		tests/py_localhost/non_tls_server.py
+280 −0		tests/py_localhost/server.py
+235 −0		tests/test_h2_client.c
+228 −96		tests/test_localhost_integ.c
+134 −19		tests/test_stream_manager.c