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//\./ } )
#lasttag=$(git describe --tags $(git rev-list --tags --max-count=10) | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1)
lasttag=$(git describe --tags $(git rev-list --tags --max-count=10) | grep -Ev '\-' | sort -V | tail -1)
newtag=$(increment_version $lasttag)
- git tag $newtag
+ newertag=$(increment_version $newtag)
+ git tag $newtag || git tag $newertag
git push --tags git@github.com:qmk/qmk_firmware.git
else
echo "No essential files modified."
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}"