From eafa215c0dca0b6d8f11f043cd28ac3fc33bd76c Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 6 Nov 2020 10:49:45 -0800
Subject: [PATCH] Reduce cargo-build-test.sh

---
 .github/workflows/pull-request.yml |  2 +-
 ci/cargo-build-test.sh             | 32 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index d5b527c8..6be3128b 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -128,7 +128,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: programs
-          path: "*.so"
+          path: "target/deploy/*.so"
           if-no-files-found: error
 
   js-test-token:
diff --git a/ci/cargo-build-test.sh b/ci/cargo-build-test.sh
index 60b2b2d1..1caaab7b 100755
--- a/ci/cargo-build-test.sh
+++ b/ci/cargo-build-test.sh
@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
 
 set -e
-cd "$(dirname "$0")"
-cd ..
+cd "$(dirname "$0")/.."
 
 source ./ci/rust-version.sh stable
 source ./ci/solana-version.sh install
@@ -12,26 +11,27 @@ export RUSTBACKTRACE=1
 
 set -x
 
-# For all BPF programs
-for Xargo_toml in $(git ls-files -- '*/Xargo.toml'); do
-  program_dir=$(dirname "$Xargo_toml")
-
-  if [ "$program_dir" == "token-swap/program" ]; then
-    address="SwaPpA9LAaLfeLi3a68M4DjnLqgtticKg6CnyNwgAC8"
-    SWAP_PROGRAM_OWNER_FEE_ADDRESS="$address" cargo build-bpf \
-      --manifest-path=token-swap/program/Cargo.toml \
-      --dump --features production
-    mv target/deploy/spl_token_swap.so target/deploy/spl_token_swap_production.so
-  fi
-
-  cargo +"$rust_stable" test-bpf --manifest-path="$program_dir"/Cargo.toml -- --nocapture
-done
+# Build/test all BPF programs
+cargo +"$rust_stable" test-bpf -- --nocapture
 
+# Build/test all host crates
 cargo +"$rust_stable" build
 cargo +"$rust_stable" test -- --nocapture
+
+# Run test-client sanity check
 cargo +"$rust_stable" run --manifest-path=utils/test-client/Cargo.toml
+
+# client_ristretto isn't in the workspace, test it explictly
 cargo +"$rust_stable" test --manifest-path=themis/client_ristretto/Cargo.toml -- --nocapture
 
+
+SWAP_PROGRAM_OWNER_FEE_ADDRESS="SwaPpA9LAaLfeLi3a68M4DjnLqgtticKg6CnyNwgAC8" \
+  cargo +"$rust_stable" build-bpf \
+    --manifest-path=token-swap/program/Cargo.toml \
+    --features production \
+    --bpf-out-dir target/deploy-production
+mv target/deploy-production/spl_token_swap.so target/deploy/spl_token_swap_production.so
+
 #  # Check generated C headers
 #  cargo run --manifest-path=utils/cgen/Cargo.toml
 #