summaryrefslogtreecommitdiff
path: root/util/travis_compiled_push.sh
diff options
context:
space:
mode:
authorStick2017-06-02 19:50:54 -0500
committerStick2017-06-02 19:50:54 -0500
commit4ba9917f829885b13ea1b3610a2f988e539c9e01 (patch)
tree612da1c6de929e6e0a5b0847d7b594cb3becdf27 /util/travis_compiled_push.sh
parent8665ed3efc62e649d0eac5b88761d7b3f8f30cd7 (diff)
parentaaa67f69305c5c78e15a1090ba7058adea59ff36 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'util/travis_compiled_push.sh')
-rw-r--r--util/travis_compiled_push.sh36
1 files changed, 23 insertions, 13 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 58334cb1f..4e08be120 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -4,11 +4,19 @@ set -o errexit -o nounset
rev=$(git rev-parse --short HEAD)
-git config --global user.name "Travis CI"
-git config --global user.email "jack.humb+travis.ci@gmail.com"
-
if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
+git config --global user.name "QMK Bot"
+git config --global user.email "hello@qmk.fm"
+
+openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d
+tar xvf secrets.tar
+
+chmod 600 id_rsa_qmk_firmware
+chmod 600 qmk.fm
+eval `ssh-agent -s`
+ssh-add id_rsa_qmk_firmware
+
increment_version ()
{
declare -a part=( ${1//\./ } )
@@ -17,14 +25,14 @@ increment_version ()
echo -e "${new// /.}"
}
-NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l)
+NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l)
if [[ $NEFM -gt 0 ]] ; then
echo "Essential files modified."
git fetch --tags
lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1)
newtag=$(increment_version $lasttag)
git tag $newtag
- git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware
+ git push --tags git@github.com:qmk/qmk_firmware.git
else
echo "No essential files modified."
fi
@@ -33,22 +41,24 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
make ergodox-ez AUTOGEN=true
- find . -name ".build" | xargs rm -rf
cd ..
- git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git
+ git clone git@github.com:qmk/qmk.fm.git
cd qmk.fm
- git submodule update --init --recursive
+ ssh-add ../qmk_firmware/qmk.fm
+ #git submodule update --init --recursive
#rm -rf keyboard
#rm -rf keyboards
- yes | cp -rf ../qmk_firmware/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
+ #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
git add -A
git commit -m "generated from qmk/qmk_firmware@${rev}"
- git push
+ git push git@github.com:qmk/qmk.fm.git
fi