webxdc/xdcget
16
14
Fork
You've already forked xdcget
41

remove xdcget.lock file in favor of export/xdcget-lock.json only #170

Open
hpk wants to merge 2 commits from hpk/remove-lock into main
pull from: hpk/remove-lock
merge into: webxdc:main
webxdc:main
webxdc:experintellia/add-tools
webxdc:fix-no-author-name
webxdc:wofwca-patch-1
webxdc:adb/update-arcanecircle-apps
webxdc:septias-patch-1
webxdc:adb/add-pixelit-update-ruffle
webxdc:adb/fix-tcm-category
webxdc:hpk/fix-ci
webxdc:adb/update-super-castle
webxdc:hpk/simplify-3-storage
webxdc:adb/issue-56
webxdc:adb/add-gitea-support
webxdc:adb/code-tweaks
webxdc:adb/issue-62
webxdc:hpk/better_checks
webxdc:adb/use-env-vars
webxdc:adb/issue-22
webxdc:hpk/export-zip
Owner
Copy link

This simplifies xdcget code internally by getting rid of "xdcget.lock" file completely, also avoiding any merge-conflicts which have held up automated deployments in the past.

NOTE: we can not merge this before https://codeberg.org/webxdc/xstore/src/branch/main/src/import.rs#L52 has been changed and deploy to read the json instead of the toml file. (Otherwise xstore would cease to function properly. )

This simplifies xdcget code internally by getting rid of "xdcget.lock" file completely, also avoiding any merge-conflicts which have held up automated deployments in the past. NOTE: we can not merge this before https://codeberg.org/webxdc/xstore/src/branch/main/src/import.rs#L52 has been changed and deploy to read the json instead of the toml file. (Otherwise xstore would cease to function properly. )

mmmh the bot is even discontinued in the mean time, so is it still a blocker for moving forward with this?

mmmh the bot is even discontinued in the mean time, so is it still a blocker for moving forward with this?
All checks were successful
/ test (push) Successful in 2m1s
This pull request has changes conflicting with the target branch.
  • tests/conftest.py
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin hpk/remove-lock:hpk/remove-lock
git switch hpk/remove-lock
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
webxdc/xdcget!170
Reference in a new issue
webxdc/xdcget
No description provided.
Delete branch "hpk/remove-lock"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?