rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use SSH to upload firmware (#3394) 

* install sshpass instead of ncftp

* use ssh

* change env vars

* fix checks and sftp>ssh
This commit is contained in:
David Holdeman 2021-10-22 15:36:15 -05:00 committed by GitHub
parent 37bf852368
commit 78e3c0c760
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.github/workflows/build-firmware.yaml vendored
View File

@ -141,10 +141,10 @@ jobs:
with: with:
java-version: '8' java-version: '8'
- name: Install multilib, mingw, ncftp and mtools - name: Install multilib, mingw, sshpass and mtools
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install gcc-multilib g++-multilib g++-mingw-w64 gcc-mingw-w64 ncftp mtools sudo apt-get install gcc-multilib g++-multilib g++-mingw-w64 gcc-mingw-w64 sshpass mtools
sudo apt-get install zip sudo apt-get install zip
sudo apt-get install dosfstools sudo apt-get install dosfstools
@ -193,14 +193,14 @@ jobs:
- name: Test Compiler - name: Test Compiler
run: arm-none-eabi-gcc -v run: arm-none-eabi-gcc -v
- name: Configs Set FTP variables - name: Configs Set SSH variables
env: env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
run: | run: |
if [ "${{github.event_name}}" = "push" ] && [ "${{github.ref}}" = "refs/heads/master" ]; then if [ "${{github.event_name}}" = "push" ] && [ "${{github.ref}}" = "refs/heads/master" ]; then
echo "::set-env name=RUSEFI_FTP_SERVER::${{secrets.RUSEFI_FTP_SERVER}}"; echo "::set-env name=RUSEFI_SSH_SERVER::${{secrets.RUSEFI_SSH_SERVER}}";
echo "::set-env name=RUSEFI_BUILD_FTP_USER::${{secrets.RUSEFI_BUILD_FTP_USER}}"; echo "::set-env name=RUSEFI_SSH_USER::${{secrets.RUSEFI_SSH_USER}}";
echo "::set-env name=RUSEFI_BUILD_FTP_PASS::${{secrets.RUSEFI_BUILD_FTP_PASS}}"; echo "::set-env name=RUSEFI_SSH_PASS::${{secrets.RUSEFI_SSH_PASS}}";
fi fi
# Build rusEFI console # Build rusEFI console
@ -274,10 +274,10 @@ jobs:
with: with:
java-version: '8' java-version: '8'
- name: Install multilib, mingw, and ncftp - name: Install multilib, mingw, and sshpass
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install gcc-multilib g++-multilib g++-mingw-w64 gcc-mingw-w64 ncftp mtools zip dosfstools sudo apt-get install gcc-multilib g++-multilib g++-mingw-w64 gcc-mingw-w64 sshpass mtools zip dosfstools
- name: Generate Enum Strings - name: Generate Enum Strings
working-directory: ./firmware/ working-directory: ./firmware/
@ -304,14 +304,14 @@ jobs:
- name: Test Compiler - name: Test Compiler
run: arm-none-eabi-gcc -v run: arm-none-eabi-gcc -v
- name: primary Set FTP variables - name: primary Set SSH variables
env: env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
run: | run: |
if [ "${{github.event_name}}" = "push" ] && [ "${{github.ref}}" = "refs/heads/master" ]; then if [ "${{github.event_name}}" = "push" ] && [ "${{github.ref}}" = "refs/heads/master" ]; then
echo "::set-env name=RUSEFI_FTP_SERVER::${{secrets.RUSEFI_FTP_SERVER}}"; echo "::set-env name=RUSEFI_SSH_SERVER::${{secrets.RUSEFI_SSH_SERVER}}";
echo "::set-env name=RUSEFI_BUILD_FTP_USER::${{secrets.RUSEFI_BUILD_FTP_USER}}"; echo "::set-env name=RUSEFI_SSH_USER::${{secrets.RUSEFI_SSH_USER}}";
echo "::set-env name=RUSEFI_BUILD_FTP_PASS::${{secrets.RUSEFI_BUILD_FTP_PASS}}"; echo "::set-env name=RUSEFI_SSH_PASS::${{secrets.RUSEFI_SSH_PASS}}";
fi fi
- name: Build Primary Bundle - name: Build Primary Bundle

12
misc/jenkins/build_working_folder.sh
View File

@ -102,11 +102,9 @@ ls -l $FULL_BUNDLE_FILE
[ -e $FULL_BUNDLE_FILE ] || { echo "$SCRIPT_NAME: ERROR not found $FULL_BUNDLE_FILE"; exit 1; } [ -e $FULL_BUNDLE_FILE ] || { echo "$SCRIPT_NAME: ERROR not found $FULL_BUNDLE_FILE"; exit 1; }
if [ -n "$RUSEFI_BUILD_FTP_USER" ]; then if [ -n "$RUSEFI_SSH_USER" ]; then
echo "$SCRIPT_NAME: Uploading full bundle" echo "$SCRIPT_NAME: Uploading full bundle"
echo put $FULL_BUNDLE_FILE . > cmd tar -czf - $FULL_BUNDLE_FILE | sshpass -p $RUSEFI_SSH_PASS ssh -o StrictHostKeyChecking=no $RUSEFI_SSH_USER@$RUSEFI_SSH_SERVER "tar -xzf - -C build_server"
cat cmd
sshpass -p $RUSEFI_BUILD_FTP_PASS sftp -o StrictHostKeyChecking=no $RUSEFI_BUILD_FTP_USER@$RUSEFI_FTP_SERVER <<< `cat cmd`
retVal=$? retVal=$?
if [ $retVal -ne 0 ]; then if [ $retVal -ne 0 ]; then
echo "full bundle upload failed" echo "full bundle upload failed"
@ -132,10 +130,8 @@ cd $FOLDER
zip -r ../$UPDATE_BUNDLE_FILE * zip -r ../$UPDATE_BUNDLE_FILE *
cd .. cd ..
ls -l $UPDATE_BUNDLE_FILE ls -l $UPDATE_BUNDLE_FILE
if [ -n "$RUSEFI_BUILD_FTP_USER" ]; then if [ -n "$RUSEFI_SSH_USER" ]; then
echo put $UPDATE_BUNDLE_FILE autoupdate > cmd tar -czf - $UPDATE_BUNDLE_FILE | sshpass -p $RUSEFI_SSH_PASS ssh -o StrictHostKeyChecking=no $RUSEFI_SSH_USER@$RUSEFI_SSH_SERVER "tar -xzf - -C build_server/autoupdate"
cat cmd
sshpass -p $RUSEFI_BUILD_FTP_PASS sftp -o StrictHostKeyChecking=no $RUSEFI_BUILD_FTP_USER@$RUSEFI_FTP_SERVER <<< `cat cmd`
retVal=$? retVal=$?
if [ $retVal -ne 0 ]; then if [ $retVal -ne 0 ]; then
echo "autoupdate upload failed" echo "autoupdate upload failed"