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

Update common.vm for all affected packages #987

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Conversation

emtuls
Copy link
Member

@emtuls emtuls commented Apr 11, 2024

From #959, there was an issue with packages not requiring the most up to date common.vm leading to many packages to fail in the daily.yml check.

There was also an issue with some older packages not performing sha256 checks due to it not being a mandatory requirement when made, which will need to be fully addressed later.

This should fix these issues.

@emtuls emtuls self-assigned this Apr 11, 2024
@emtuls emtuls added 🐛 bug Something isn't working 🌀 FLARE-VM A package or feature to be used by FLARE-VM 🌀 COMMANDO-VM A package or future to be used by COMMANDO VM labels Apr 11, 2024
@emtuls emtuls force-pushed the fix-merge-git-and-zip branch 2 times, most recently from eb68674 to e2f9cd1 Compare April 11, 2024 18:06
Copy link
Member

@Ana06 Ana06 left a comment

Choose a reason for hiding this comment

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

It looks to me like you are removing code in common.vm by accident

packages/common.vm/tools/vm.common/vm.common.psm1 Outdated Show resolved Hide resolved
packages/common.vm/tools/vm.common/vm.common.psm1 Outdated Show resolved Hide resolved
packages/common.vm/tools/vm.common/vm.common.psm1 Outdated Show resolved Hide resolved
packages/common.vm/tools/vm.common/vm.common.psm1 Outdated Show resolved Hide resolved
@emtuls emtuls force-pushed the fix-merge-git-and-zip branch from e2f9cd1 to 084b4d4 Compare April 11, 2024 18:21
@emtuls
Copy link
Member Author

emtuls commented Apr 11, 2024

That would be correct. Too many ctrl-z's 😬

Thanks for catching that!

@emtuls emtuls force-pushed the fix-merge-git-and-zip branch 2 times, most recently from c855eeb to 61fda2b Compare April 11, 2024 19:29
@emtuls emtuls requested a review from Ana06 April 11, 2024 19:30
packages/common.vm/tools/vm.common/vm.common.psm1 Outdated Show resolved Hide resolved
packages/dnspyex.vm/tools/chocolateyinstall.ps1 Outdated Show resolved Hide resolved
packages/file.vm/tools/chocolateyinstall.ps1 Outdated Show resolved Hide resolved
@emtuls emtuls force-pushed the fix-merge-git-and-zip branch 5 times, most recently from 303be5f to fd4e741 Compare April 11, 2024 23:44
@emtuls emtuls force-pushed the fix-merge-git-and-zip branch from fd4e741 to 8b4738d Compare April 12, 2024 00:23
@emtuls emtuls changed the title Update common.vm For All Effected Packages Update common.vm For All affected Packages Apr 12, 2024
@emtuls emtuls requested a review from Ana06 April 12, 2024 01:35
@emtuls emtuls changed the title Update common.vm For All affected Packages Update common.vm for all affected packages Apr 12, 2024
@@ -397,7 +399,7 @@ function VM-Install-From-Zip {
VM-Install-Shortcut -toolName $toolName -category $category -executablePath $executablePath -consoleApp $consoleApp -arguments $arguments
Install-BinFile -Name $toolName -Path $executablePath
}
return $executablePath
return ,@($toolDir, $executablePath)
Copy link
Member

Choose a reason for hiding this comment

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

Strange syntax with this comma. Maybe we should add a comment to clarify what this does, but this shouldn't block the PR as the packages are broken.

@Ana06 Ana06 merged commit 26f8968 into main Apr 12, 2024
6 checks passed
@emtuls emtuls deleted the fix-merge-git-and-zip branch April 12, 2024 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐛 bug Something isn't working 🌀 COMMANDO-VM A package or future to be used by COMMANDO VM 🌀 FLARE-VM A package or feature to be used by FLARE-VM
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants