Conversation
…ctDir` if it is empty (#6092) Co-authored-by: Hsiao-nan Cheung <niheaven@gmail.com>
Co-authored-by: Hsiao-nan Cheung <niheaven@gmail.com>
Signed-off-by: Chawye Hsu <su+git@chawyehsu.com>
…6327) Co-authored-by: Hsiao-nan Cheung <niheaven@gmail.com>
* global arg * changelog
* first step * Revert "first step" This reverts commit c5907c3. * refactor(Get-Manifest): Select actual source for installed manifest * rework sub-commands, `scoop-depends` is NOT working at this stage * URI manifest * opt * deprecated manifest * source of manifests * source of manifest pt2 - Mark URI(path/URL/UNC/etc.) query as standalone manifest - Drop `installed` and `available update` items for [query] and [installed] are different sources. * remove variable preventing I forget it * scoop-info: fix source of manifest on bucket * fix `scoop-depends` * Fix Standalone and Source detection * fix global install * Fix scoop-cat, scoop-home - Query for remote manifest * scoop-list: info +deprecated * manifest: Fix first selected manifest * gramma.. * Fix 61b3259 * length
* fix(scoop-depends-tests): Mocking `USE_EXTERNAL_7ZIP` as $false to avoding error when it is $true * CHANGELOG
* feat(autoupdate): predefined hash case for GitHub - Remove `sha256:` prefix in `format_hash()` - Add GitHub support in `get_hash_for_app()` Close #6381 * doc(chglog): GitHub auto hash update * fix(autoupdate): remove prefix only
* docs(CHANGELOG): Update to 0.5.3 * 6416
|
I am a bit out of the current situation, what is going on? |
Apparently, I mistakenly clicked squash merge, all changes of #6257 are combined to single commit on master branch. |
|
Scoop rolling updates relies on git repo, so we cannot do a force-push to fix commit logs. Can |
|
I think if we just revert the PR then the |
|
Since most of the members are inactive, we can just hold it, syncing branchs doesn't seem to make much impact. this mistake has weakened the convenience of code review. |
|
Should we consider start preparing 0.5.4 then? |
We need to release a hotfix to solve bug caused by #6416. I don't know how to sync develop branch with master for current situation. In my indie workflow, I will just re-checkout a fresh one. Lines 267 to 269 in ebd8c03 It doesn't check if the https://github.com/ScoopInstaller/Main/actions/runs/16891017302/job/47850541846#step:3:514 |
|
Hmm, so what's the situation now? |
0.5.3's PR has been incorrectly merged to |
Before that, it is required to sync the historical commits to the main branch. |
|
The squash merge should be fixed since next release... Ed. Don't merge to develop before branch sync |
|
I have tried to fix it, but seem require permission to direct push, otherwise they will produce extras commits (via PR). |
|
Wait a moment, I'm trying to sync the repo |
You cannot direct push to the main branch, and at least one member review is required to merge. This is by design. I believe this PR could be re-opened to do the sync. After that, an extra master -> develop merge, which can be a direct push, is needed. |
Sure, even target is develop branch. |
|
I meant no review approvals needed for dev branch, but yeah PR is required for both protected branches. |

Description
Motivation and Context
Closes #XXXX
Relates to #XXXX
How Has This Been Tested?
Checklist:
developbranch.