summaryrefslogtreecommitdiff
path: root/pkgs/development/python-modules/rangehttpserver
diff options
context:
space:
mode:
authorWolfgang Walther <walther@technowledgy.de>2025-11-04 10:06:36 +0100
committerWolfgang Walther <walther@technowledgy.de>2025-11-04 10:06:36 +0100
commit747d9e2d348b154162b76b4fc24f10f02ad9e55e (patch)
tree75712455fd3771eea2017ec8172594c91fb870b5 /pkgs/development/python-modules/rangehttpserver
parent6a54ddb71f8ac9f214e66ba5463bfbd594c96a59 (diff)
ci/github-script/merge: switch order of merge operations
We previously used auto-merge first and then enqueued explicitly on the assumption that auto-merge would fail if the PR was actually in mergeable state already. This turned out to be false. Instead, we currently face the problem of auto-merge sometimes getting stuck. This seems to happen when, at the time of enabling auto-merge, the required status checks already passed and the PR would be ready to go - but sometimes GitHub doesn't do it. This *can* be unblocked by approving the PR again, which seems to run the internal "let's check whether we can merge this" procedures on the GitHub side again. However, we can probably also solve this by just explicitly trying to enqueue the PR first - and only if that fails, fall back to auto-merge. I previously argued against that, based on a potential race condition, in which a PR could become ready to merge between these two requests - at which point the auto-merge operation would fail, if the original assumption was true. But since we don't observe this, we might as well switch.
Diffstat (limited to 'pkgs/development/python-modules/rangehttpserver')
0 files changed, 0 insertions, 0 deletions