Compare commits

..

3 Commits

Author SHA1 Message Date
Jordan Atwood b373f0a1b9
Fail music transfer when local file lookup fails 1 year ago
Jordan Atwood 564979b0c7
Add `git checkout -` alias 1 year ago
Jordan Atwood e80e804e03
Remove grand exchange offer slot wrapping branch 1 year ago
  1. 3
      src/.bin/music-transfer.py
  2. 1
      src/.bin/open-runelite.sh
  3. 1
      src/.gitconfig

@ -78,6 +78,9 @@ for line in open(paths_file, 'r'):
source_files.add(file_path) source_files.add(file_path)
else: else:
print(f'[TRACE] Unknown file extension of entry: {file}', file=sys.stderr) print(f'[TRACE] Unknown file extension of entry: {file}', file=sys.stderr)
elif not path.exists():
print(f'[ERROR] Could not find source path: {path}')
sys.exit(3)
if len(source_files) == 0: if len(source_files) == 0:
print('No source files to transfer') print('No source files to transfer')

@ -17,7 +17,6 @@ BRANCHES_TO_MERGE=(
multi-step-cryptic-spade multi-step-cryptic-spade
quest-speedrunning-widget-overlays quest-speedrunning-widget-overlays
fixed-thrall-timer fixed-thrall-timer
fix-grand-exchange-offer-slot-wrapping
gwd-altar-timer gwd-altar-timer
) )
MAX_AGE_BEFORE_REBUILD="$(( 18 * 60 * 60 ))" # 18 hours MAX_AGE_BEFORE_REBUILD="$(( 18 * 60 * 60 ))" # 18 hours

@ -14,6 +14,7 @@
[ $# -ne 2 ] && echo 'Two arguments required, PR # and branch name' && exit 1; \ [ $# -ne 2 ] && echo 'Two arguments required, PR # and branch name' && exit 1; \
git fetch upstream pull/$1/head:$2-$1 && git checkout $2-$1 && git merge master --no-gpg-sign --no-edit; \ git fetch upstream pull/$1/head:$2-$1 && git checkout $2-$1 && git merge master --no-gpg-sign --no-edit; \
}; f" }; f"
c- = checkout -
diffc = diff --cached diffc = diff --cached
fixup = commit --amend --no-edit fixup = commit --amend --no-edit
fixup-a = commit -a --amend --no-edit fixup-a = commit -a --amend --no-edit

Loading…
Cancel
Save