From 5dbfcadfdbf2aad1d693e859288f6f18eeea4c28 Mon Sep 17 00:00:00 2001
From: Mark Sinclair <mmsinclair@users.noreply.github.com>
Date: Fri, 3 Feb 2023 17:15:16 +0000
Subject: [PATCH] GitHub Actions: fix up build-and-upload-binaries-ci.yml

---
 .../build-and-upload-binaries-ci.yml          | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build-and-upload-binaries-ci.yml b/.github/workflows/build-and-upload-binaries-ci.yml
index 048400f548..448b947179 100644
--- a/.github/workflows/build-and-upload-binaries-ci.yml
+++ b/.github/workflows/build-and-upload-binaries-ci.yml
@@ -34,7 +34,7 @@ on:
       - 'tools/ts-rs-cli/**'
 
 env:
-  NETWORK: mainnet    
+  NETWORK: mainnet
 
 jobs:
   publish-nym:
@@ -47,6 +47,15 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Prepare build output directory
+        shell: bash
+        env:
+          OUTPUT_DIR: ci-builds/${{ github.ref_name }}
+        run: |
+          rm -rf ci-builds || true
+          mkdir -p $OUTPUT_DIR
+          echo $OUTPUT_DIR
+
       - name: Install Dependencies (Linux)
         run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
         continue-on-error: true
@@ -75,31 +84,29 @@ jobs:
 
       - name: Prepare build output
         shell: bash
+        env:
+          OUTPUT_DIR: ci-builds/${{ github.ref_name }}
         run: |
-          rm -rf ci-builds || true
-          mkdir ci-builds
+          cp target/release/nym-client $OUTPUT_DIR
+          cp target/release/nym-gateway $OUTPUT_DIR
+          cp target/release/nym-mixnode $OUTPUT_DIR
+          cp target/release/nym-socks5-client $OUTPUT_DIR
+          cp target/release/nym-api $OUTPUT_DIR
+          cp target/release/nym-network-requester $OUTPUT_DIR
+          cp target/release/nym-network-statistics $OUTPUT_DIR
+          cp target/release/nym-cli $OUTPUT_DIR
 
-          cp target/release/nym-client ci-builds
-          cp target/release/nym-gateway ci-builds
-          cp target/release/nym-mixnode ci-builds
-          cp target/release/nym-socks5-client ci-builds
-          cp target/release/nym-api ci-builds
-          cp target/release/nym-network-requester ci-builds
-          cp target/release/nym-network-statistics ci-builds
-          cp target/release/nym-cli ci-builds
-
-          cp contracts/target/wasm32-unknown-unknown/release/mixnet_contract.wasm ci-builds
-          cp contracts/target/wasm32-unknown-unknown/release/vesting_contract.wasm ci-builds
+          cp contracts/target/wasm32-unknown-unknown/release/mixnet_contract.wasm $OUTPUT_DIR
+          cp contracts/target/wasm32-unknown-unknown/release/vesting_contract.wasm $OUTPUT_DIR
 
       - name: Deploy branch to CI www
         continue-on-error: true
         uses: easingthemes/ssh-deploy@main
         env:
           SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
-          ARGS: "-rltgoDzvO --delete"
+          ARGS: "-avzr"
           SOURCE: "ci-builds/"
           REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
           REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
-          TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/builds/${{ env.GITHUB_REF_NAME }}/
+          TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/builds/
           EXCLUDE: "/dist/, /node_modules/"
-