Skip to content

Instantly share code, notes, and snippets.

@Cyberboss
Last active November 24, 2018 18:32
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Cyberboss/f301a11d86df4844097d145be4d4b884 to your computer and use it in GitHub Desktop.
Save Cyberboss/f301a11d86df4844097d145be4d4b884 to your computer and use it in GitHub Desktop.
#!/bin/bash
for ID in "$@"
do
git branch -D pr-$ID
done
set -e
git reset --hard
git checkout master
git fetch upstream
git reset --hard upstream/master
git push -f
for ID in "$@"
do
git fetch upstream pull/$ID/head:pr-$ID
done
for ID in "$@"
do
git merge --no-ff -m "Merge pull request #$ID" pr-$ID
git branch -D pr-$ID
done
echo -e "\n#define UNIT_TESTS" >> code/_compile_options.dm
S:/Games/byond/bin/dm.exe tgstation.dme
rm -rf data/logs/maintainer
S:/Games/byond/bin/DreamDaemon.exe tgstation.dmb -close -trusted -verbose -params "test-run&log-directory=travis"
cat data/logs/maintainer/clean_run.lk
if [ $? -eq 0 ]; then
git push upstream master
git push
fi
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment