Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch 'develop' into 'master' #4594

Merged
merged 34 commits into from
Dec 25, 2021
Merged

Merge branch 'develop' into 'master' #4594

merged 34 commits into from
Dec 25, 2021

Conversation

niheaven
Copy link
Member

@niheaven niheaven commented Dec 24, 2021

Related PRs:

Fixed or closed issues:

niheaven and others added 30 commits November 22, 2021 22:50
* show manifest on installation

* Inline function

* Update install.ps1

Co-authored-by: Rashil Gandhi <[email protected]>
* Added the check for the Windows version.

* Apply suggestions from code review

Co-Authored-By: Jakub Čábera <[email protected]>

* Additional lines added by GitHubs suggestion system removed. Function for the version check removed. If-condition adjusted to check for Major and Build version.

* TIL Windows 8.1 = major version 6, Windows 10 = major version 10.

* Update diagnostic.ps1

Co-authored-by: Jakub Čábera <[email protected]>
Co-authored-by: Ross Smith II <[email protected]>
* chore(config): Document all configuration options

* Update README.md

* Update scoop-config.ps1

* Update scoop-config.ps1

* Update scoop-config.ps1

* Add env vars
@niheaven niheaven requested a review from a team December 24, 2021 08:26
@rashil2000
Copy link
Member

Regarding #4528 (comment), I think we should do something about it - otherwise any manifest without URL will fail. See #4285.

@niheaven
Copy link
Member Author

niheaven commented Dec 24, 2021

For something like meta manifests that without url, a lots of work to support them should be done, and IMO it is out of scope of these PRs.

@rashil2000
Copy link
Member

Okay, but we should still do something about the Cannot bind argument to parameter 'URL' because it is null. error, maybe in a hotfix later.

lib/core.ps1 Show resolved Hide resolved
@niheaven niheaven merged commit 1dbab1f into master Dec 25, 2021
@LazyGeniusMan
Copy link

Not sure if it's related but AppVeyor start to fail after this is merged. [1] [2] [3]

Command executed with exception: Exception calling "Validate" with "1" argument(s): "Could not resolve schema reference 'http://scoop.sh/draft/schema#/definitions/license'. Path 'definitions.autoupdateArch.properties.license', line 224, position 28."

Is this related to #4528 ? or appveyor.yml need to be updated?

@rashil2000
Copy link
Member

rashil2000 commented Dec 26, 2021

Also, develop is still ahead of master by 34 commits after this merge. Maybe we shouldn't use Squash and merge for these merges?

@niheaven
Copy link
Member Author

"Merge' is off in this repo 😢 Indeed, 'develop' and 'master' are identical after this merge, and reverse merge from 'master' to 'develop' should be done after such merge. Do it next time or enable 'merge commits' in the repo.

@rashil2000
Copy link
Member

I think all team members can change the merge settings. This is what I see:

image

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