37d2f6dc2a
* Switch version incrementing to the command put together by @noroadsleft. * Update util/travis_compiled_push.sh Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
89 lines
2.5 KiB
Bash
Executable File
89 lines
2.5 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
source util/travis_push.sh
|
|
|
|
set -o errexit -o nounset
|
|
|
|
rev=$(git rev-parse --short HEAD)
|
|
echo "Using git hash ${rev}"
|
|
|
|
if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
|
|
|
|
# convert to unix line-endings
|
|
git checkout master
|
|
git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix
|
|
git diff --diff-filter=M --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//\./ } )
|
|
part[2]=$((part[2] + 1))
|
|
new="${part[*]}"
|
|
echo -e "${new// /.}"
|
|
}
|
|
|
|
git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}
|
|
|
|
NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | grep -Ev '^(users/)' | grep -Ev '^(layouts/)' | wc -l)
|
|
if [[ $NEFM -gt 0 ]] ; then
|
|
echo "Essential files modified."
|
|
git fetch --tags
|
|
lasttag=$(git tag --sort=-creatordate --no-column --list '*.*.*' | grep -E -m1 '^[0-9]+\.[0-9]+\.[0-9]+$')
|
|
newtag=$(increment_version $lasttag)
|
|
until git tag $newtag; do
|
|
newtag=$(increment_version $newtag)
|
|
done
|
|
git push --tags git@github.com:qmk/qmk_firmware.git
|
|
else
|
|
echo "No essential files modified."
|
|
fi
|
|
|
|
if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
|
|
make generate-keyboards-file SILENT=true > .keyboards
|
|
cd ..
|
|
git clone git@github.com:qmk/qmk.fm.git
|
|
cd qmk.fm
|
|
mv ../qmk_firmware/id_rsa_qmk.fm id_rsa_qmk.fm
|
|
mv ../qmk_firmware/.keyboards .
|
|
ssh-add -D
|
|
eval `ssh-agent -s`
|
|
ssh-add id_rsa_qmk.fm
|
|
|
|
# don't delete files in case not all keyboards are built
|
|
# rm -f compiled/*.hex
|
|
|
|
# ignore errors here
|
|
# In theory, this is more flexible, and will allow for additional expansion of additional types of files and other names
|
|
mv ../qmk_firmware/*_default.*{hex,bin} ./compiled/ || true
|
|
|
|
# get the list of keyboards
|
|
readarray -t keyboards < .keyboards
|
|
|
|
# replace / with _
|
|
keyboards=("${keyboards[@]//[\/]/_}")
|
|
|
|
# remove all binaries that don't belong to a keyboard in .keyboards
|
|
for file in "./compiled"/* ; do
|
|
match=0
|
|
for keyboard in "${keyboards[@]}" ; do
|
|
if [[ ${file##*/} = "${keyboard}_default.bin" ]] || [[ ${file##*/} = "${keyboard}_default.hex" ]]; then
|
|
match=1
|
|
break
|
|
fi
|
|
done
|
|
if [[ $match = 0 ]]; then
|
|
echo "Removing deprecated binary: $file"
|
|
rm "$file"
|
|
fi
|
|
done
|
|
|
|
bash _util/generate_keyboard_page.sh
|
|
git add -A
|
|
git commit -m "generated from qmk/qmk_firmware@${rev}"
|
|
git push git@github.com:qmk/qmk.fm.git
|
|
|
|
fi
|
|
|
|
fi
|