From 3075d4881e879c39002c95111c8f70d7ad0a3ad7 Mon Sep 17 00:00:00 2001
From: Bret Ambrose <bretambrose@gmail.com>
Date: Wed, 6 Oct 2021 12:52:11 -0700
Subject: [PATCH 1/5] Upstream builds contain the build output in a different
 relative directory than direct builds

---
 .builder/action/aws-c-http-test.sh | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/.builder/action/aws-c-http-test.sh b/.builder/action/aws-c-http-test.sh
index 0e21158f1..1eb1cbd8e 100644
--- a/.builder/action/aws-c-http-test.sh
+++ b/.builder/action/aws-c-http-test.sh
@@ -2,8 +2,21 @@ PROXY_SETUP=/tmp/setup_proxy_test_env.sh
 if [ -f "$PROXY_SETUP" ]; then
     source $PROXY_SETUP
     export AWS_PROXY_NO_VERIFY_PEER=on
-    echo "setting proxy integration test envrionment"
+    echo "setting proxy integration test environment"
+fi
+
+pushd
+
+if [ -d "./build/aws-c-http/"]; then
+    # This is the directory (relative to repo root) that will contain the build when the repo is built directly by the
+    # builder
+    cd ./build/aws-c-http/
+elif [ -d "../../aws-c-http"]; then
+    # This is the directory (relative to repo root) that will contain the build when the repo is built as an upstream
+    # consumer
+    cd ../../aws-c-http
 fi
 
-cd ./build/aws-c-http/
 ctest --output-on-failure
+
+popd

From 8786a8de7f36667e0129d99b25aaaead88bcb109 Mon Sep 17 00:00:00 2001
From: Bret Ambrose <bretambrose@gmail.com>
Date: Wed, 6 Oct 2021 13:04:51 -0700
Subject: [PATCH 2/5] Oops pushd

---
 .builder/action/aws-c-http-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.builder/action/aws-c-http-test.sh b/.builder/action/aws-c-http-test.sh
index 1eb1cbd8e..f59aaf4b8 100644
--- a/.builder/action/aws-c-http-test.sh
+++ b/.builder/action/aws-c-http-test.sh
@@ -5,7 +5,7 @@ if [ -f "$PROXY_SETUP" ]; then
     echo "setting proxy integration test environment"
 fi
 
-pushd
+pushd .
 
 if [ -d "./build/aws-c-http/"]; then
     # This is the directory (relative to repo root) that will contain the build when the repo is built directly by the

From c61ca28bfd8a1e0060eb13cc0a48a9411c454b61 Mon Sep 17 00:00:00 2001
From: Bret Ambrose <bretambrose@gmail.com>
Date: Wed, 6 Oct 2021 13:45:30 -0700
Subject: [PATCH 3/5] push/pop aren't needed

---
 .builder/action/aws-c-http-test.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.builder/action/aws-c-http-test.sh b/.builder/action/aws-c-http-test.sh
index f59aaf4b8..b81b69f5c 100644
--- a/.builder/action/aws-c-http-test.sh
+++ b/.builder/action/aws-c-http-test.sh
@@ -5,13 +5,11 @@ if [ -f "$PROXY_SETUP" ]; then
     echo "setting proxy integration test environment"
 fi
 
-pushd .
-
-if [ -d "./build/aws-c-http/"]; then
+if [ -d "./build/aws-c-http/" ]; then
     # This is the directory (relative to repo root) that will contain the build when the repo is built directly by the
     # builder
     cd ./build/aws-c-http/
-elif [ -d "../../aws-c-http"]; then
+elif [ -d "../../aws-c-http" ]; then
     # This is the directory (relative to repo root) that will contain the build when the repo is built as an upstream
     # consumer
     cd ../../aws-c-http
@@ -19,4 +17,3 @@ fi
 
 ctest --output-on-failure
 
-popd

From 7a25f2d53904f41c6b647648fdc90040e404bc0e Mon Sep 17 00:00:00 2001
From: Bret Ambrose <bretambrose@gmail.com>
Date: Wed, 6 Oct 2021 13:54:30 -0700
Subject: [PATCH 4/5] Trigger downstream where appropriate?

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0b61da7a7..4dcfb10b2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,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 }} downstream
+        ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build downstream -p ${{ env.PACKAGE_NAME }}
 
   linux-compiler-compat:
     runs-on: ubuntu-latest
@@ -56,7 +56,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-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }} --spec downstream
+          ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build downstream -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }}
 
   clang-sanitizers:
     runs-on: ubuntu-latest
@@ -86,7 +86,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-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON downstream
+          ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build downstream -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON
 
   windows:
     runs-on: windows-latest
@@ -122,6 +122,6 @@ jobs:
       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 }} downstream
+        ./builder build downstream -p ${{ env.PACKAGE_NAME }}
 
 

From e5f144a96bec5847d82968f8deef3bfb5c97f304 Mon Sep 17 00:00:00 2001
From: Bret Ambrose <bretambrose@gmail.com>
Date: Wed, 6 Oct 2021 13:59:38 -0700
Subject: [PATCH 5/5] Skip downstream BYO_CRYPTO, don't have time to monkey
 with

---
 .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 4dcfb10b2..50000da88 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -86,7 +86,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-${{ env.LINUX_BASE_IMAGE }} build downstream -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON
+          ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON
 
   windows:
     runs-on: windows-latest