diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index 570104484c..75f897986f 100644 --- a/.github/workflows/build-firmware.yaml +++ b/.github/workflows/build-firmware.yaml @@ -390,7 +390,7 @@ jobs: - name: Package Bundle if: ${{( github.event_name == 'push' && github.ref == 'refs/heads/master' && env.skip != 'true' ) || inputs.lts }} - run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh ${{matrix.build-target}} ${{matrix.ini-file}} ${{ github.ref_name }} + run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh ${{matrix.build-target}} ${{matrix.ini-file}} ${{ github.ref_name }} ${{ toJSON(inputs.lts) }} - name: Upload .ini files if: ${{( github.event_name == 'push' && github.ref == 'refs/heads/master' && env.skip != 'true' ) || inputs.lts }} @@ -498,7 +498,7 @@ jobs: - name: Package Bundle if: ${{( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || inputs.lts }} - run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh default default ${{ github.ref_name }} + run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh default default ${{ github.ref_name }} ${{ toJSON(inputs.lts) }} - name: Attach console junit results if: always() diff --git a/misc/jenkins/build_working_folder.sh b/misc/jenkins/build_working_folder.sh index e848d3a63b..6c8feee6cb 100755 --- a/misc/jenkins/build_working_folder.sh +++ b/misc/jenkins/build_working_folder.sh @@ -116,7 +116,7 @@ ls -l $FULL_BUNDLE_FILE if [ -n "$RUSEFI_SSH_USER" ]; then echo "$SCRIPT_NAME: Uploading full bundle" retVal=0 - if [ -n "$1" ]; then + if [ "$2" = "true" ]; then tar -czf - $FULL_BUNDLE_FILE | sshpass -p $RUSEFI_SSH_PASS ssh -o StrictHostKeyChecking=no $RUSEFI_SSH_USER@$RUSEFI_SSH_SERVER "mkdir -p build_server/lts/$1; tar -xzf - -C build_server/lts/$1" retVal=$? else diff --git a/misc/jenkins/compile_other_versions/prepare_bundle.sh b/misc/jenkins/compile_other_versions/prepare_bundle.sh index 440c1519a1..73678e7244 100644 --- a/misc/jenkins/compile_other_versions/prepare_bundle.sh +++ b/misc/jenkins/compile_other_versions/prepare_bundle.sh @@ -12,7 +12,7 @@ export FOLDER="temp/snapshot_${TIMESTAMP}_${BUNDLE_NAME}_rusefi" export BUNDLE_FULL_NAME="rusefi_bundle_${BUNDLE_NAME}" -bash misc/jenkins/build_working_folder.sh "$3" +bash misc/jenkins/build_working_folder.sh "$3" "$4" pwd echo "exiting $SCRIPT_NAME"