From 7f76fac9af705062f9fb5e1e822847a44a232363 Mon Sep 17 00:00:00 2001
From: Zhihui Xia <zhvxia@amazon.com>
Date: Mon, 14 Nov 2022 09:39:40 -0800
Subject: [PATCH 1/6] initial linux-arm ci update

---
 .github/workflows/ci.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aada67c30..de5c9eece 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,6 +99,19 @@ 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 }} --compiler=${{ matrix.compiler }}
 
+  linux-arm:
+    name: ARM (${{ matrix.arch }})
+    runs-on: ubuntu-20.04 # latest
+    strategy:
+      matrix:
+        arch: [armv6, armv7, arm64]
+    steps:
+      - name: Build ${{ env.PACKAGE_NAME }}
+        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 }} --target=linux-${{ matrix.arch }} --spec=downstream
+
   windows:
     runs-on: windows-2022 # latest
     strategy:

From da3b68451c13cc9bcb4f49f3977374e2b73a6ffa Mon Sep 17 00:00:00 2001
From: Zhihui Xia <zhvxia@amazon.com>
Date: Wed, 21 Dec 2022 09:53:12 -0800
Subject: [PATCH 2/6] merge with main

---
 .github/workflows/ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 504640fd9..a55eeb6a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,7 +102,6 @@ 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 }} --compiler=${{ matrix.compiler }}
 
-<<<<<<< HEAD
   linux-arm:
     name: ARM (${{ matrix.arch }})
     runs-on: ubuntu-20.04 # latest
@@ -115,8 +114,6 @@ 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 }} --target=linux-${{ matrix.arch }} --spec=downstream
-=======
->>>>>>> c1c25ca3e6f028d83c1fb29ca0ce5dbcf7665023
 
   windows:
     runs-on: windows-2022 # latest

From 38315c4f580b6c24f3f07af1123264c5fa3f7b46 Mon Sep 17 00:00:00 2001
From: Zhihui Xia <zhvxia@amazon.com>
Date: Thu, 5 Jan 2023 09:31:21 -0800
Subject: [PATCH 3/6] use alpine for armv6

---
 .github/workflows/ci.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a55eeb6a9..42bc68838 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,18 +102,21 @@ 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 }} --compiler=${{ matrix.compiler }}
 
-  linux-arm:
-    name: ARM (${{ matrix.arch }})
-    runs-on: ubuntu-20.04 # latest
+    linux-compat:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        arch: [armv6, armv7, arm64]
+        image:
+          - alpine-3.16-armv6
+    permissions:
+      id-token: write # This is required for requesting the JWT
     steps:
+      - name: Install qemu/docker
+        run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
       - name: Build ${{ env.PACKAGE_NAME }}
         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 }} --target=linux-${{ matrix.arch }} --spec=downstream
+          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 }}
 
   windows:
     runs-on: windows-2022 # latest

From 72bd0df513c8ade07fbc749963e70cdcaeaaf652 Mon Sep 17 00:00:00 2001
From: Zhihui Xia <zhvxia@amazon.com>
Date: Thu, 5 Jan 2023 10:14:27 -0800
Subject: [PATCH 4/6] fix syntax

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 42bc68838..db1d734aa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,7 +102,7 @@ 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 }} --compiler=${{ matrix.compiler }}
 
-    linux-compat:
+  linux-compat:
     runs-on: ubuntu-latest
     strategy:
       matrix:

From 075c577e439608fd9925dced7e4aa3faa8dd2217 Mon Sep 17 00:00:00 2001
From: Zhihui Xia <zhvxia@amazon.com>
Date: Thu, 5 Jan 2023 10:32:23 -0800
Subject: [PATCH 5/6] rename ci job

---
 .github/workflows/ci.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index db1d734aa..24882d04a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,12 +102,8 @@ 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 }} --compiler=${{ matrix.compiler }}
 
-  linux-compat:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        image:
-          - alpine-3.16-armv6
+  alpine-3.16-armv6:
+    runs-on: ubuntu-20.04
     permissions:
       id-token: write # This is required for requesting the JWT
     steps:
@@ -116,7 +112,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 }}
+          ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-alpine-3.16-armv6 build -p ${{ env.PACKAGE_NAME }}
 
   windows:
     runs-on: windows-2022 # latest

From 1826e955429f4cd20298b69fecea2a49f94aeafd Mon Sep 17 00:00:00 2001
From: Zhihui Xia <zhvxia@amazon.com>
Date: Thu, 5 Jan 2023 10:33:17 -0800
Subject: [PATCH 6/6] rename ci job

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 24882d04a..94f71888e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,7 +102,7 @@ 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 }} --compiler=${{ matrix.compiler }}
 
-  alpine-3.16-armv6:
+  alpine-armv6:
     runs-on: ubuntu-20.04
     permissions:
       id-token: write # This is required for requesting the JWT