You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
As discussed with @tonymorony using a put to push code is not an ideal situation. Conflicts have been plaguing us with the electrum scan report which will no longer be pushed once #549 is merged. Removing this file also removes the "grace period" functionality implemented in #539 as it no longer has a prior reference timestamp to determine the last time a connection was made, so in order to implement automated alerts / dashboard for electrum status, we need to find a home for this file. If completely removing bot generated PRs, the same would apply to the coins_config.json
Below are few options to overcome this:
Schedule periodic manual updates to these files to be pushed manually (without bot) to coins repo
Do not include in coins repo at all, and just have gui repos generate them as needed and pushed to the gui repo
Store these files elsewhere, for example in their own repo which would include API for guis to be aware of update to the canonical version commit hash and alert / dashboard code which will display electrum status and, if contacts are listed in the electrum entry, alert the maintainer to resolve the issue.
Please add comments to this thread if you have an idea for an alternative proposal, and I'll add them to the list above.
The root cause of this issue is that when two or more PRs are in play to master branch, as soon as one is merged, the other sees this as a change it does not have, which needs to be resolved. A .old file would likely just shift the conflict to that file.
Realisically, these PRs should not include the generated files, though it is common enough they are added with a git add . or were intentionally included so another repo could reference them in the coins repo PR branch while working on a related PR.
Perhaps adding a branch name to the filename like coins_config_dev.json when the generator is run in a non-master branch would eliminate the potential for conflicts to occur, though it may add the requirement for some routine maintenance to purge older/stale files.
As discussed with @tonymorony using a put to push code is not an ideal situation. Conflicts have been plaguing us with the electrum scan report which will no longer be pushed once #549 is merged. Removing this file also removes the "grace period" functionality implemented in #539 as it no longer has a prior reference timestamp to determine the last time a connection was made, so in order to implement automated alerts / dashboard for electrum status, we need to find a home for this file. If completely removing bot generated PRs, the same would apply to the
coins_config.json
Below are few options to overcome this:
Please add comments to this thread if you have an idea for an alternative proposal, and I'll add them to the list above.
cc: @tonymorony @yurii-khi @SirSevenG
The text was updated successfully, but these errors were encountered: