drashna/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ignore docs, fix tag/hex pushing

Browse Source
This commit is contained in:
Jack Humbert 2017-05-28 16:16:56 -04:00
parent de0a058da7
commit 71feac5717
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
util/qmk.fm.enc Normal file
View File

Binary file not shown.

BIN
util/qmk_firmware.enc Normal file
View File

Binary file not shown.

14
util/travis_compiled_push.sh
View File

@ -7,6 +7,14 @@ rev=$(git rev-parse --short HEAD)
git config --global user.name "Travis CI" git config --global user.name "Travis CI"
git config --global user.email "jack.humb+travis.ci@gmail.com" git config --global user.email "jack.humb+travis.ci@gmail.com"
openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in util/qmk_firmware.enc -out qmk_firmware -d
openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in util/qmk.fm.enc -out qmk.fm -d
chmod 600 qmk_firmware
chmod 600 qmk.fm
eval `ssh-agent -s`
ssh-add qmk_firmware
ssh-add qmk.fm
if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
increment_version () increment_version ()
@ -17,14 +25,14 @@ increment_version ()
echo -e "${new// /.}" 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 if [[ $NEFM -gt 0 ]] ; then
echo "Essential files modified." echo "Essential files modified."
git fetch --tags git fetch --tags
lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1) 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) newtag=$(increment_version $lasttag)
git tag $newtag git tag $newtag
git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware git push --tags
else else
echo "No essential files modified." echo "No essential files modified."
fi fi
@ -34,7 +42,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
make ergodox-ez AUTOGEN=true make ergodox-ez AUTOGEN=true
cd .. cd ..
git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git git clone git@github.com:qmk/qmk.fm.git
cd qmk.fm cd qmk.fm
#git submodule update --init --recursive #git submodule update --init --recursive
#rm -rf keyboard #rm -rf keyboard