From 2f3369b6928735a63516d2e90321fb049d499553 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Sun, 25 Feb 2024 12:04:53 -0500
Subject: [PATCH] only: custom boards bugfix, order of operations - make
 consumes SSH env variables

---
 .github/workflows/build-firmware.yaml     |  2 +-
 .github/workflows/custom-board-build.yaml | 26 +++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml
index 6064713959..0d0ebcfe43 100644
--- a/.github/workflows/build-firmware.yaml
+++ b/.github/workflows/build-firmware.yaml
@@ -563,7 +563,7 @@ jobs:
       if: ${{ env.skip != 'true' }}
       run: arm-none-eabi-gcc -v
 
-    - name: Configs Set SSH variables
+    - name: Configs build_server upload SSH variables
       if: ${{ env.full == 'true' && env.upload == 'server' }}
       env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
diff --git a/.github/workflows/custom-board-build.yaml b/.github/workflows/custom-board-build.yaml
index 59231d4a5f..cfc1312cd3 100644
--- a/.github/workflows/custom-board-build.yaml
+++ b/.github/workflows/custom-board-build.yaml
@@ -170,6 +170,19 @@ jobs:
         working-directory: generated/tunerstudio/generated
         run: ../../../${{inputs.rusefi_dir}}/firmware/tunerstudio/upload_ini.sh ${{ secrets.RUSEFI_ONLINE_FTP_USER }} ${{ secrets.RUSEFI_ONLINE_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }}
 
+      - name: Configs build_server upload SSH variables
+        env:
+          ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
+        run: |
+          if [ "${{github.event_name}}" = "push" ] && [ "${{github.ref}}" = "refs/heads/master" ]; then
+            echo "Setting credentials..."
+            echo "RUSEFI_SSH_SERVER=${{secrets.RUSEFI_SSH_SERVER}}" >> $GITHUB_ENV
+            echo "RUSEFI_SSH_USER=${{secrets.RUSEFI_SSH_USER}}" >> $GITHUB_ENV
+            echo "RUSEFI_SSH_PASS=${{secrets.RUSEFI_SSH_PASS}}" >> $GITHUB_ENV
+          else
+            echo "NOT setting credentials: ${{github.event_name}} ${{github.ref}}"
+          fi
+
       - name: Build Firmware
         working-directory: ${{inputs.rusefi_dir}}/firmware
         run: bash bin/compile.sh -b ${{ env.BOARD_META_PATH }} deliver/rusefi.bin
@@ -210,19 +223,6 @@ jobs:
           name: rusefi.elf
           path: ${{inputs.rusefi_dir}}/firmware/build/rusefi*.elf
 
-      - name: Set SSH variables
-        env:
-          ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
-        run: |
-          if [ "${{github.event_name}}" = "push" ] && [ "${{github.ref}}" = "refs/heads/master" ]; then
-            echo "Setting credentials..."
-            echo "RUSEFI_SSH_SERVER=${{secrets.RUSEFI_SSH_SERVER}}" >> $GITHUB_ENV
-            echo "RUSEFI_SSH_USER=${{secrets.RUSEFI_SSH_USER}}" >> $GITHUB_ENV
-            echo "RUSEFI_SSH_PASS=${{secrets.RUSEFI_SSH_PASS}}" >> $GITHUB_ENV
-          else
-            echo "NOT setting credentials: ${{github.event_name}} ${{github.ref}}"
-          fi
-
       - name: Upload github action bundle artifact
         uses: actions/upload-artifact@v4
         with: