From fcef1c26eb99105b5b814b2c6eaf3e7a079c667a Mon Sep 17 00:00:00 2001
From: MinyazevR <89993880+MinyazevR@users.noreply.github.com>
Date: Sun, 28 Jul 2024 20:56:53 +0300
Subject: [PATCH] GHA CI: Fix installer deploy (#1749)

* Fix error with quotes

* Add secrets: inherit flag for reusable workflow

* Update build_installer.sh
---
 .github/workflows/linux_build.yml      |  1 +
 .github/workflows/macos_build.yml      |  1 +
 buildScripts/github/build_installer.sh | 12 ++++++------
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml
index 6c9bc8e57c..cb6e1ed519 100644
--- a/.github/workflows/linux_build.yml
+++ b/.github/workflows/linux_build.yml
@@ -89,3 +89,4 @@ jobs:
       build_installer: true
       qmake_extra: "CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
       tests: true
+    secrets: inherit
diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml
index 29c847ad7d..ad6f22c926 100644
--- a/.github/workflows/macos_build.yml
+++ b/.github/workflows/macos_build.yml
@@ -94,3 +94,4 @@ jobs:
       build_installer: true
       qmake_extra: " CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
       tests: true
+    secrets: inherit
diff --git a/buildScripts/github/build_installer.sh b/buildScripts/github/build_installer.sh
index d9926029e3..1947e7e161 100755
--- a/buildScripts/github/build_installer.sh
+++ b/buildScripts/github/build_installer.sh
@@ -20,22 +20,22 @@ df -h .
 NEED_DEPLOY=$([[ "$GITHUB_REPOSITORY" == "trikset/trik-studio" && "${PULLREQUESTNUMBER:-false}" == "false" ]] && echo true || echo false )
 
 if $NEED_DEPLOY ; then
-    $EXECUTOR bash -ic "install -m 600 -D /dev/null ~/.ssh/id_rsa && echo $ssh_key > ~/.ssh/id_rsa"
+    $EXECUTOR bash -c "mkdir -p ~/.ssh && install -m 600 /dev/null ~/.ssh/id_rsa && echo \"$ssh_key\" > ~/.ssh/id_rsa"
 fi
           
 if [[ $RUNNER_OS == Linux ]] ; then
       echo Start build checker archive
-      $EXECUTOR bash -ic "bin/$CONFIG/build-checker-installer.sh"
+      $EXECUTOR bash -c "bin/$CONFIG/build-checker-installer.sh"
       if $NEED_DEPLOY ; then
-          $EXECUTOR bash -ic "rsync -v --rsh="ssh -o StrictHostKeyChecking=no" bin/$CONFIG/trik_checker.tar.xz $username@$host:~/dl/ts/fresh/checker/checker-linux-$CONFIG-$BRANCH_NAME.tar.xz"
+          $EXECUTOR bash -c "rsync -v --rsh='ssh -o StrictHostKeyChecking=no' bin/$CONFIG/trik_checker.tar.xz $username@$host:~/dl/ts/fresh/checker/checker-linux-$CONFIG-$BRANCH_NAME.tar.xz"
       fi
 fi
 
 echo Start build installer
-$EXECUTOR bash -ic "installer/build-trik-studio.sh $QTBIN $QTIFWBIN ."
+$EXECUTOR bash -c "installer/build-trik-studio.sh $QTBIN $QTIFWBIN ."
 
 if $NEED_DEPLOY ; then
-    $EXECUTOR bash -ic "\
+    $EXECUTOR bash -c "\
           mv installer/trik-studio*installer* installer/$TSNAME \
-          && rsync -v --rsh="ssh -o StrictHostKeyChecking=no" installer/$TSNAME $username@$host:~/dl/ts/fresh/installer/$TSNAME"
+          && rsync -v --rsh='ssh -o StrictHostKeyChecking=no' installer/$TSNAME $username@$host:~/dl/ts/fresh/installer/$TSNAME"
 fi