Skip to content

Conversation

@niheaven
Copy link
Member

Description

Resync with develop branch w/ a hotfix.

Motivation and Context

Relates to #6434

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 15 commits August 9, 2024 11:03
…ctDir` if it is empty (#6092)

Co-authored-by: Hsiao-nan Cheung <[email protected]>
* 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
@niheaven
Copy link
Member Author

Okay, we must have a UGLY git log.

@chawyehsu
Copy link
Member

Don't merge to develop before branch sync

#6435 introduced conflicts, making the situation more complicated.. it should have been committed after the sync. 😅

@niheaven
Copy link
Member Author

Yeah, I found it AFTER merged the PR, sadly...

@HUMORCE
Copy link
Member

HUMORCE commented Aug 12, 2025

Please take a look for #6437, it just grabs that squash commit from master and an empty commit.

Sync should be done when 0.5.4 release, right?

@Lutra-Fs
Copy link
Member

Lutra-Fs commented Aug 12, 2025

It looks like #6437 would be better for our git log? We could merge master to develop then merge develop to master.

@niheaven
Copy link
Member Author

I've merged master into develop, and after this PR, develop should be sync with master again, that's all done.

@niheaven
Copy link
Member Author

@ScoopInstaller/maintainers Plan to going on today, so anyone could approve this PR?

@Lutra-Fs
Copy link
Member

@ScoopInstaller/maintainers Plan to going on today, so anyone could approve this PR?

Approved. Hopefully everything will be fine.

@niheaven niheaven merged commit b588a06 into master Aug 12, 2025
2 checks passed
@niheaven
Copy link
Member Author

All done, now develop is synced with master, and we could start v0.5.4 now.

@HUMORCE
Copy link
Member

HUMORCE commented Aug 12, 2025

Appreciate work and communication you guys made.

@Lutra-Fs
Copy link
Member

#6438 may require our attention

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.

10 participants