From bd9e020df93206ef32d35229d91349526f2e10e8 Mon Sep 17 00:00:00 2001
From: lneto <lneto@cloudflare.com>
Date: Mon, 5 Aug 2024 10:44:33 +0100
Subject: [PATCH] TUN-8583: change final directory of artifacts

---
 .teamcity/package-windows.sh | 10 ++++++----
 build-packages-fips.sh       |  4 ++--
 build-packages.sh            |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.teamcity/package-windows.sh b/.teamcity/package-windows.sh
index 0139a51b..a4b91d93 100755
--- a/.teamcity/package-windows.sh
+++ b/.teamcity/package-windows.sh
@@ -3,14 +3,16 @@ echo $VERSION
 
 export TARGET_OS=windows
 # This controls the directory the built artifacts go into
-export ARTIFACT_DIR=built_artifacts/
-mkdir -p $ARTIFACT_DIR
+export BUILT_ARTIFACT_DIR=built_artifacts/
+export FINAL_ARTIFACT_DIR=artifacts/
+mkdir -p $BUILT_ARTIFACT_DIR
+mkdir -p $FINAL_ARTIFACT_DIR
 windowsArchs=("amd64" "386")
 for arch in ${windowsArchs[@]}; do
     export TARGET_ARCH=$arch
     # Copy exe into final directory
-    cp $ARTIFACT_DIR/cloudflared-windows-$arch.exe ./cloudflared.exe
+    cp $BUILT_ARTIFACT_DIR/cloudflared-windows-$arch.exe ./cloudflared.exe
     make cloudflared-msi
     # Copy msi into final directory
-    mv cloudflared-$VERSION-$arch.msi $ARTIFACT_DIR/cloudflared-windows-$arch.msi
+    mv cloudflared-$VERSION-$arch.msi $FINAL_ARTIFACT_DIR/cloudflared-windows-$arch.msi
 done
diff --git a/build-packages-fips.sh b/build-packages-fips.sh
index a7401eab..0ec3b3c9 100755
--- a/build-packages-fips.sh
+++ b/build-packages-fips.sh
@@ -3,7 +3,7 @@ VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*")
 echo $VERSION
 
 # This controls the directory the built artifacts go into
-export ARTIFACT_DIR=built_artifacts/
+export ARTIFACT_DIR=artifacts/
 mkdir -p $ARTIFACT_DIR
 
 arch=("amd64")
@@ -23,4 +23,4 @@ make cloudflared-rpm
 mv cloudflared-fips-$RPMVERSION-1.$RPMARCH.rpm $ARTIFACT_DIR/cloudflared-fips-linux-$RPMARCH.rpm
 
 # finally move the linux binary as well.
-mv ./cloudflared $ARTIFACT_DIR/cloudflared-fips-linux-$arch
\ No newline at end of file
+mv ./cloudflared $ARTIFACT_DIR/cloudflared-fips-linux-$arch
diff --git a/build-packages.sh b/build-packages.sh
index 9570dab0..df5dc7bb 100755
--- a/build-packages.sh
+++ b/build-packages.sh
@@ -7,7 +7,7 @@ export GOEXPERIMENT=noboringcrypto
 export CGO_ENABLED=0
 
 # This controls the directory the built artifacts go into
-export ARTIFACT_DIR=built_artifacts/
+export ARTIFACT_DIR=artifacts/
 mkdir -p $ARTIFACT_DIR
 
 linuxArchs=("386" "amd64" "arm" "armhf" "arm64")