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

Use wingetcreate to publish Windows releases #459

Merged

Conversation

ldennington
Copy link
Collaborator

Remove custom mjcheetham/update-winget task in favor of using the wingetcreate tool.

See a preview of what the new manifests minted by wingetcreate will look like here. Note however that I have submitted some modifications here both for correctness and compatibility with wingetcreate.

Copy link
Member

@dscho dscho left a comment

Choose a reason for hiding this comment

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

To make the next rebase to a new Git for Windows version easier, could this commit be marked up as a fixup! commit?

@ldennington
Copy link
Collaborator Author

To make the next rebase to a new Git for Windows version easier, could this commit be marked up as a fixup! commit?

Ah yes my apologies for forgetting. When I run git blame I see that parts of the file were changed with different commits. In this scenario, do I run git commit --fixup against the earlier of the 2 commits?

@dscho
Copy link
Member

dscho commented Nov 3, 2021

To make the next rebase to a new Git for Windows version easier, could this commit be marked up as a fixup! commit?

Ah yes my apologies for forgetting. When I run git blame I see that parts of the file were changed with different commits. In this scenario, do I run git commit --fixup against the earlier of the 2 commits?

Yes, I would split the commit into two fixup!s. At least that's what I usually would do.

In this instance, it looks as if the release-winget.yml file was touched by 2b74bbb, 88c6b40 and c9c8d9e. In the tentative rebase to v2.34.0-rc0, we squashed all of the updates back into the commit that creates that file: c81cf35. So maybe just do git commit --fixup c81cf3508b12d55fb76ed469199db52785a93452 --amend (since it does not use the actual hash, but the oneline instead, it does not really matter whether you use c81cf35 or 2b74bbb)?

@derrickstolee
Copy link
Collaborator

The Scalar Functional tests are failing because I changed microsoft/scalar to work with v2.34.0. We will want to take this change into the vfs-2.34.0 branch when its ready. We could even force-merge it here and take it in the tentative/vfs-2.34.0 branch when you're done, @ldennington.

@ldennington
Copy link
Collaborator Author

ldennington commented Nov 3, 2021

The Scalar Functional tests are failing because I changed microsoft/scalar to work with v2.34.0. We will want to take this change into the vfs-2.34.0 branch when its ready. We could even force-merge it here and take it in the tentative/vfs-2.34.0 branch when you're done, @ldennington.

Sounds good. I'll have to work the issues on the wingetcreate side before merging. Planning for that to be my focus today.

run: |
# Get correct release asset
$github = Get-Content '${{ github.event_path }}' | ConvertFrom-Json
$asset = $github.release.assets | Where-Object -Property name -match '.exe$'
Copy link
Member

Choose a reason for hiding this comment

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

Neat!

@ldennington
Copy link
Collaborator Author

ldennington commented Nov 4, 2021

Good news!! The wingetcreate folks have already merged the needed fix on their end. We should be good to merge this as soon as their next release is live 😊😊😊. I'll go ahead and do the fixups before I finish up for the day, though, to make sure I don't forget.

@derrickstolee What do you think would be the best way to ensure this makes it into vfs-2.34.0?

@derrickstolee
Copy link
Collaborator

@derrickstolee What do you think would be the best way to ensure this makes it into vfs-2.34.0?

@ldennington merge this and I will rebase it (and its merge commit) onto the tentative/vfs-2.34.0 branch.

@dscho
Copy link
Member

dscho commented Nov 8, 2021

rebase it (and its merge commit)

Or maybe just squash it into the commit that introduces .github/workflows/release-winget.yml?

@derrickstolee
Copy link
Collaborator

rebase it (and its merge commit)

Or maybe just squash it into the commit that introduces .github/workflows/release-winget.yml?

well, that would happen in the next rebase, which will happen before the release.

@ldennington ldennington force-pushed the enable-winget-create branch 2 times, most recently from b0c58ad to c331e5b Compare November 11, 2021 02:43
@ldennington ldennington changed the base branch from vfs-2.33.0 to vfs-2.34.0 November 11, 2021 02:46
@ldennington ldennington changed the base branch from vfs-2.34.0 to tentative/vfs-2.34.0 November 11, 2021 02:47
@ldennington
Copy link
Collaborator Author

Re-opening following corrected rebase

@ldennington ldennington reopened this Nov 11, 2021
@ldennington ldennington merged commit 3ed7a5b into microsoft:tentative/vfs-2.34.0 Nov 11, 2021
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.

3 participants