Skip to content

chore(release): Bump to version 0.5.3#6434

Closed
HUMORCE wants to merge 14 commits into
masterfrom
develop
Closed

chore(release): Bump to version 0.5.3#6434
HUMORCE wants to merge 14 commits into
masterfrom
develop

Conversation

@HUMORCE

@HUMORCE HUMORCE commented Aug 11, 2025

Copy link
Copy Markdown
Member

Description

Motivation and Context

Closes #XXXX

Relates to #XXXX

How Has This Been Tested?

Checklist:

  • I have read the Contributing Guide.
  • I have ensured that I am targeting the develop branch.
  • I have updated the documentation accordingly.
  • I have updated the tests accordingly.
  • I have added an entry in the CHANGELOG.

o-l-a-v and others added 14 commits August 9, 2024 11:03
…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>
* 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
@Lutra-Fs

Copy link
Copy Markdown
Member

I am a bit out of the current situation, what is going on?

@HUMORCE

HUMORCE commented Aug 11, 2025

Copy link
Copy Markdown
Member Author

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.

@HUMORCE

HUMORCE commented Aug 11, 2025

Copy link
Copy Markdown
Member Author

Scoop rolling updates relies on git repo, so we cannot do a force-push to fix commit logs.

Can line changes/compare/git revert work when these commits merged back into master branch through this PR?

@Lutra-Fs

Copy link
Copy Markdown
Member

I think if we just revert the PR then the dev branch will lost track to main, right? And we cannot rebase and force push dev as well since many user is also using dev as their SCOOP BRANCH setting

@HUMORCE

HUMORCE commented Aug 11, 2025

Copy link
Copy Markdown
Member Author

I noticed that #5924(0.4.1) also a squash merge, and then synced via bb88dfb

@HUMORCE

HUMORCE commented Aug 11, 2025

Copy link
Copy Markdown
Member Author

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.

@HUMORCE HUMORCE closed this Aug 11, 2025
@Lutra-Fs

Copy link
Copy Markdown
Member

Should we consider start preparing 0.5.4 then?

@HUMORCE

HUMORCE commented Aug 12, 2025

Copy link
Copy Markdown
Member Author

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.

Scoop/lib/autoupdate.ps1

Lines 267 to 269 in ebd8c03

if ($url -match 'https:\/\/github\.com\/(?<owner>[^\/]+)\/(?<repo>[^\/]+)\/releases\/download\/[^\/]+\/[^\/]+') {
$hashmode = 'github'
}

It doesn't check if the hash.url is already set, effect action (hash extraction).

https://github.com/ScoopInstaller/Main/actions/runs/16891017302/job/47850541846#step:3:514

@chawyehsu

Copy link
Copy Markdown
Member

Hmm, so what's the situation now?

@Lutra-Fs

Copy link
Copy Markdown
Member

Hmm, so what's the situation now?

0.5.3's PR has been incorrectly merged to main using squash

@chawyehsu

Copy link
Copy Markdown
Member

0.5.3's PR has been incorrectly merged to main using squash

Should we consider start preparing 0.5.4 then?

Before that, it is required to sync the historical commits to the main branch.

@niheaven

niheaven commented Aug 12, 2025

Copy link
Copy Markdown
Member

The squash merge should be fixed since next release...

Ed.

Don't merge to develop before branch sync

@HUMORCE

HUMORCE commented Aug 12, 2025

Copy link
Copy Markdown
Member Author

I have tried to fix it, but seem require permission to direct push, otherwise they will produce extras commits (via PR).

@niheaven

Copy link
Copy Markdown
Member

Wait a moment, I'm trying to sync the repo

@chawyehsu

chawyehsu commented Aug 12, 2025

Copy link
Copy Markdown
Member

I have tried to fix it, but seem require permission to direct push, otherwise they will produce extras commits (via PR).

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.

@HUMORCE

HUMORCE commented Aug 12, 2025

Copy link
Copy Markdown
Member Author

You cannot direct push to the main branch, and at least one member review is required to merge. This is by design.

Sure, even target is develop branch.


g fetch --all --prune
g checkout develop; g merge upstream/master; g checkout master; g merge develop
g checkout -b chore/sync
g push origin develop # push test, should be a PR instead.

screenshot_250812041858

@chawyehsu

Copy link
Copy Markdown
Member

I meant no review approvals needed for dev branch, but yeah PR is required for both protected branches.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants