mirror of https://github.com/rusefi/rusefi.git
parent
1e3da7c42a
commit
cb9bb32246
|
@ -264,7 +264,7 @@ jobs:
|
||||||
working-directory: ./artifacts
|
working-directory: ./artifacts
|
||||||
run: |
|
run: |
|
||||||
source ../firmware/config/boards/common_script_read_meta_env.inc ../firmware/${{ env.BOARD_META_PATH }}
|
source ../firmware/config/boards/common_script_read_meta_env.inc ../firmware/${{ env.BOARD_META_PATH }}
|
||||||
bash ../firmware/bin/upload_bundle.sh ${{ secrets.RUSEFI_SSH_USER }} ${{ secrets.RUSEFI_SSH_PASS }} ${{ secrets.RUSEFI_SSH_SERVER }} ${BUNDLE_NAME}
|
bash ../firmware/bin/upload_bundle.sh ${{ secrets.RUSEFI_SSH_USER }} "${{ secrets.RUSEFI_SSH_PASS }}" ${{ secrets.RUSEFI_SSH_SERVER }} ${BUNDLE_NAME}
|
||||||
|
|
||||||
- name: Add Bundles to Release
|
- name: Add Bundles to Release
|
||||||
if: ${{ env.full == 'true' && env.upload == 'release' }}
|
if: ${{ env.full == 'true' && env.upload == 'release' }}
|
||||||
|
@ -284,7 +284,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
source config/boards/common_script_read_meta_env.inc ${{ env.BOARD_META_PATH }}
|
source config/boards/common_script_read_meta_env.inc ${{ env.BOARD_META_PATH }}
|
||||||
cd ${META_OUTPUT_ROOT_FOLDER}tunerstudio/generated
|
cd ${META_OUTPUT_ROOT_FOLDER}tunerstudio/generated
|
||||||
${OLDPWD}/tunerstudio/upload_ini.sh ${{ secrets.RUSEFI_ONLINE_FTP_USER }} ${{ secrets.RUSEFI_ONLINE_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }}
|
${OLDPWD}/tunerstudio/upload_ini.sh ${{ secrets.RUSEFI_ONLINE_FTP_USER }} "${{ secrets.RUSEFI_ONLINE_FTP_PASS }}" ${{ secrets.RUSEFI_FTP_SERVER }}
|
||||||
|
|
||||||
- name: Upload github action elf artifact
|
- name: Upload github action elf artifact
|
||||||
if: ${{ env.partial == 'true' }}
|
if: ${{ env.partial == 'true' }}
|
||||||
|
|
|
@ -297,7 +297,7 @@ runs:
|
||||||
if: ${{ contains(inputs.uploads, 'ini') }}
|
if: ${{ contains(inputs.uploads, 'ini') }}
|
||||||
working-directory: ${{inputs.rusefi_dir}}/firmware/${{env.META_OUTPUT_ROOT_FOLDER}}tunerstudio/generated
|
working-directory: ${{inputs.rusefi_dir}}/firmware/${{env.META_OUTPUT_ROOT_FOLDER}}tunerstudio/generated
|
||||||
shell: bash
|
shell: bash
|
||||||
run: ${{github.workspace}}/${{inputs.rusefi_dir}}/firmware/tunerstudio/upload_ini.sh ${{ inputs.RUSEFI_ONLINE_FTP_USER }} ${{ inputs.RUSEFI_ONLINE_FTP_PASS }} ${{ inputs.RUSEFI_FTP_SERVER }}
|
run: ${{github.workspace}}/${{inputs.rusefi_dir}}/firmware/tunerstudio/upload_ini.sh ${{ inputs.RUSEFI_ONLINE_FTP_USER }} "${{ inputs.RUSEFI_ONLINE_FTP_PASS }}" ${{ inputs.RUSEFI_FTP_SERVER }}
|
||||||
|
|
||||||
- name: Upload github action bin artifact
|
- name: Upload github action bin artifact
|
||||||
if: ${{ contains(inputs.artifacts, 'bin') }}
|
if: ${{ contains(inputs.artifacts, 'bin') }}
|
||||||
|
@ -366,7 +366,7 @@ runs:
|
||||||
if: ${{ contains(inputs.artifacts, 'obfuscated') }}
|
if: ${{ contains(inputs.artifacts, 'obfuscated') }}
|
||||||
working-directory: ${{inputs.rusefi_dir}}/artifacts
|
working-directory: ${{inputs.rusefi_dir}}/artifacts
|
||||||
shell: bash
|
shell: bash
|
||||||
run: bash ../firmware/bin/upload_bundle.sh ${{ inputs.RUSEFI_OBFUSCATED_PUBLIC_SSH_USER }} ${{ inputs.RUSEFI_OBFUSCATED_PUBLIC_SSH_PASS }} ${{ inputs.RUSEFI_OBFUSCATED_PUBLIC_SSH_SERVER }} "${{env.SHORT_BOARD_NAME}}_obfuscated_public"
|
run: bash ../firmware/bin/upload_bundle.sh ${{ inputs.RUSEFI_OBFUSCATED_PUBLIC_SSH_USER }} "${{ inputs.RUSEFI_OBFUSCATED_PUBLIC_SSH_PASS }}" ${{ inputs.RUSEFI_OBFUSCATED_PUBLIC_SSH_SERVER }} "${{env.SHORT_BOARD_NAME}}_obfuscated_public"
|
||||||
|
|
||||||
- name: Upload github action bundle obfuscated_public artifact
|
- name: Upload github action bundle obfuscated_public artifact
|
||||||
if: ${{ contains(inputs.artifacts, 'obfuscated') }}
|
if: ${{ contains(inputs.artifacts, 'obfuscated') }}
|
||||||
|
|
|
@ -33,10 +33,10 @@ if [ -n "${USER}" -a -n "$PASS" -a -n "${HOST}" ]; then
|
||||||
else
|
else
|
||||||
DESTINATION_FOLDER="${bundle_upload_folder}"
|
DESTINATION_FOLDER="${bundle_upload_folder}"
|
||||||
fi
|
fi
|
||||||
tar -czf - $FULL_BUNDLE_FILE | sshpass -p $PASS ssh -o StrictHostKeyChecking=no ${USER}@${HOST} "mkdir -p ${DESTINATION_FOLDER}; tar -xzf - -C ${DESTINATION_FOLDER}"
|
tar -czf - $FULL_BUNDLE_FILE | sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no ${USER}@${HOST} "mkdir -p ${DESTINATION_FOLDER}; tar -xzf - -C ${DESTINATION_FOLDER}"
|
||||||
RET=$((RET+$?+PIPESTATUS))
|
RET=$((RET+$?+PIPESTATUS))
|
||||||
if [ -f $UPDATE_BUNDLE_FILE ]; then
|
if [ -f $UPDATE_BUNDLE_FILE ]; then
|
||||||
tar -czf - $UPDATE_BUNDLE_FILE | sshpass -p $PASS ssh -o StrictHostKeyChecking=no ${USER}@${HOST} "mkdir -p ${DESTINATION_FOLDER}/autoupdate; tar -xzf - -C ${DESTINATION_FOLDER}/autoupdate"
|
tar -czf - $UPDATE_BUNDLE_FILE | sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no ${USER}@${HOST} "mkdir -p ${DESTINATION_FOLDER}/autoupdate; tar -xzf - -C ${DESTINATION_FOLDER}/autoupdate"
|
||||||
RET=$((RET+$?+PIPESTATUS))
|
RET=$((RET+$?+PIPESTATUS))
|
||||||
else
|
else
|
||||||
echo "File $UPDATE_BUNDLE_FILE does not exist."
|
echo "File $UPDATE_BUNDLE_FILE does not exist."
|
||||||
|
|
Loading…
Reference in New Issue