summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoofar <toofar@spalge.com>2022-12-08 08:40:30 +1300
committertoofar <toofar@spalge.com>2022-12-08 08:40:30 +1300
commit6ba122ced41524a95484a3f3ebc595ea0a543a01 (patch)
treef933c8ef0e9137d4594b4d9803e5fa16b7790c72
parent59086b870b476c5b752c5b7e96798a82dc598682 (diff)
downloadqutebrowser-6ba122ced41524a95484a3f3ebc595ea0a543a01.tar.gz
qutebrowser-6ba122ced41524a95484a3f3ebc595ea0a543a01.zip
fix cache to handle multiple tool runs
The cache for changes due to pyupgrade aren't the same from "pyupgrade" as "black pyupgrade", so include the full set of commands in the cache path. Unfortunately that makes the cache less useful across different configurations, but hopefully it still helps me when developing this.
-rwxr-xr-xscripts/check_mergability.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/check_mergability.sh b/scripts/check_mergability.sh
index cc432c530..1e8affc89 100755
--- a/scripts/check_mergability.sh
+++ b/scripts/check_mergability.sh
@@ -249,7 +249,7 @@ rebase_with_formatting () {
# it.
cmds="$cmds"
-inputf="\$(mktemp)"
+inputf="\$(mktemp --suffix=rebase)"
cat > "\$inputf"
# TODO: de-dup these with the parent script?
@@ -265,8 +265,8 @@ run_with_cache () {
cmd="\$2"
input_hash="\$(sha1sum "\$inputf" | cut -d' ' -f1)"
- mkdir -p /tmp/filter-caches/\$cmd 2>/dev/null
- outputf=/tmp/filter-caches/\$cmd/\$input_hash
+ mkdir -p "/tmp/filter-caches/\$cmds/\$cmd" 2>/dev/null
+ outputf="/tmp/filter-caches/\$cmds/\$cmd/\$input_hash"
[ -e "\$outputf" ] || \$cmd < "\$inputf" > "\$outputf"