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

winget: Updates manifest schema #2192

Merged
merged 1 commit into from
Jul 29, 2024
Merged

Conversation

vyncent-t
Copy link
Contributor

@vyncent-t vyncent-t commented Jul 23, 2024

Update Winget Schema to 1.6.0

Fixes #2191

Description

This PR updates the Winget schema used in Headlamp from version 1.5.0 to 1.6.0. Additionally, the DisplayVersion field, which has been removed by Winget contributors, is removed to align with the latest schema requirements and maintain compatibility.

Changes

  • Updated Winget schema version from 1.5.0 to 1.6.0.
  • Removed the deprecated DisplayVersion field as per Winget contributors' guidelines.

Verification

  • Ensured that the schema update to 1.6.0 is correctly implemented and all references are updated.
  • Verified that removing the DisplayVersion field does not cause any issues and aligns with the latest Winget schema.

@vyncent-t vyncent-t force-pushed the winget-manifest-schema-upgrade branch from 0893498 to 99390bc Compare July 23, 2024 20:48
@vyncent-t vyncent-t marked this pull request as ready for review July 23, 2024 21:14
@illume
Copy link
Collaborator

illume commented Jul 24, 2024

Something is very wrong here with the commit as there are 159 files changed. Seems like a rebase/merge issue.

@vyncent-t
Copy link
Contributor Author

may need to downgrade the the prettier to not have this format error

@illume illume added this to the v0.25.0 milestone Jul 25, 2024
@illume
Copy link
Collaborator

illume commented Jul 25, 2024

@vyncent-t Please rebase?

Also, please do the formatting changes in a separate commit (or PR).

@joaquimrocha joaquimrocha force-pushed the winget-manifest-schema-upgrade branch from 99390bc to c6e488e Compare July 25, 2024 09:07
@joaquimrocha
Copy link
Collaborator

I have fixed the format issues, but I don't think this is all there is to update the format to 1.6.
I haven't tested with the validator, but it just looks different from these changes (maybe some of them aren't needed, like release notes, but we should add the others).

Copy link
Collaborator

@illume illume left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks 👍

Copy link
Collaborator

@illume illume left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missed the comments from Joaquim about needed changes.

@joaquimrocha joaquimrocha removed this from the v0.25.0 milestone Jul 25, 2024
@vyncent-t
Copy link
Contributor Author

vyncent-t commented Jul 25, 2024

Just compared the changes for 1.6.0 schema for each of these to what is in 1.5.0 and it doesn't seem to have any more additional required fields to be added

and the only difference I can see is that someone must have changed a locale field ReleaseNotes since it's not in the the previous winget schemas for locale (it's only in 0.24.1) nor does it generate automatically when the script runs, although I can't find the source of that change like we were able to find the source of the change for the displayVersion being removed which has been removed here.

other than that there aren't any differences that I can spot between the optional and required fields already used here

@vyncent-t vyncent-t force-pushed the winget-manifest-schema-upgrade branch from c6e488e to 36f354b Compare July 25, 2024 15:00
@vyncent-t
Copy link
Contributor Author

I think there is an unsigned commit that is throwing the error?

image

@joaquimrocha joaquimrocha force-pushed the winget-manifest-schema-upgrade branch from 36f354b to c7031b4 Compare July 26, 2024 09:33
@joaquimrocha
Copy link
Collaborator

The problem was the mismatch between the signoff and the author of the commit. It's fixed now, but we did talk about having the format closer to what was in that 0.24.1 version I had to modify this week.

@vyncent-t
Copy link
Contributor Author

I think I may have pushed the windows copy on mistake (the one I have to create for validation)

pushing the linux side one now

@vyncent-t vyncent-t force-pushed the winget-manifest-schema-upgrade branch from c7031b4 to be339c1 Compare July 26, 2024 13:39
@joaquimrocha joaquimrocha merged commit 1ca874d into main Jul 29, 2024
17 checks passed
@joaquimrocha joaquimrocha deleted the winget-manifest-schema-upgrade branch July 29, 2024 21:24
@illume illume added bug Something isn't working windows Issues related to Windows or WSL distribution Related to distributing headlamp (for example with package managers or listed on websites) labels Jul 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working distribution Related to distributing headlamp (for example with package managers or listed on websites) windows Issues related to Windows or WSL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix winget manifest generation
3 participants