diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/2-setup-environment-win.bat | 4 | ||||
| -rwxr-xr-x | util/install_dependencies.sh | 4 | ||||
| -rw-r--r-- | util/travis_compiled_push.sh | 34 |
3 files changed, 24 insertions, 18 deletions
diff --git a/util/2-setup-environment-win.bat b/util/2-setup-environment-win.bat index 3e54cc776..22a2e17f7 100644 --- a/util/2-setup-environment-win.bat +++ b/util/2-setup-environment-win.bat @@ -34,14 +34,14 @@ ECHO ------------------------------------------ ECHO Installing dfu-programmer. ECHO ------------------------------------------ ECHO. -wget 'http://downloads.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip' >> %STARTINGDIR%\environment-setup.log +wget --no-check-certificate 'http://downloads.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip' >> %STARTINGDIR%\environment-setup.log unzip -o dfu-programmer-win-0.7.2.zip >> %STARTINGDIR%\environment-setup.log COPY dfu-programmer.exe .. >> %STARTINGDIR%\environment-setup.log ECHO ------------------------------------------ ECHO Downloading driver ECHO ------------------------------------------ -wget http://downloads.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip >> %STARTINGDIR%\environment-setup.log +wget --no-check-certificate http://downloads.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip >> %STARTINGDIR%\environment-setup.log unzip -o libusb-win32-bin-1.2.6.0.zip >> %STARTINGDIR%\environment-setup.log COPY libusb-win32-bin-1.2.6.0\bin\x86\libusb0_x86.dll ../libusb0.dll >> %STARTINGDIR%\environment-setup.log diff --git a/util/install_dependencies.sh b/util/install_dependencies.sh index 1b73a8b3b..227c86f87 100755 --- a/util/install_dependencies.sh +++ b/util/install_dependencies.sh @@ -111,4 +111,8 @@ elif [[ -n "$(type -P pkg)" ]]; then arm-none-eabi-binutils \ arm-none-eabi-newlib \ diffutils +elif [[ -n "$(type -P emerge)" ]]; then + echo 'Please check that your gcc is built with the multilib use flag enabled.' + emerge -vq sys-devel/crossdev + USE="-openmp -hardened -sanitize -vtv" crossdev -s4 --stable --g =4.9.4 --portage --verbose --target avr fi diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 4936ca0ba..af9fc51d9 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -13,10 +13,16 @@ openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_i tar xvf secrets.tar chmod 600 id_rsa_qmk_firmware -chmod 600 qmk.fm +chmod 600 id_rsa_qmk.fm eval `ssh-agent -s` ssh-add id_rsa_qmk_firmware +# convert to unix line-endings +git checkout master +git diff --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix +git diff --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add +git commit -m "convert to unix line-endings [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master + increment_version () { declare -a part=( ${1//\./ } ) @@ -42,24 +48,20 @@ fi if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then - make ergodox-ez AUTOGEN=true - cd .. git clone git@github.com:qmk/qmk.fm.git cd qmk.fm - mv ../qmk_firmware/qmk.fm qmk.fm - ssh-add qmk.fm - #git submodule update --init --recursive - #rm -rf keyboard - #rm -rf keyboards - #yes | cp -rf ../qmk_firmware/keyboards . - #mkdir keyboards/ergodox_ez/ - #cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html - #cp ../qmk_firmware/readme.md qmk_readme.md - #./generate.sh - rm -f _compiled/*.hex - for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done - for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done + mv ../qmk_firmware/id_rsa_qmk.fm id_rsa_qmk.fm + ssh-add -D + eval `ssh-agent -s` + ssh-add id_rsa_qmk.fm + + # not sure this is needed now + # rm -f compiled/*.hex + + # ignore errors here + for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "compiled/${file##*/}" || true; done + for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*.hex; do mv -v "$file" "compiled/${file##*/}" || true; done git add -A git commit -m "generated from qmk/qmk_firmware@${rev}" |