Skip to content

Conversation

@iangmaia
Copy link
Contributor

@iangmaia iangmaia commented Nov 19, 2025

As reported in #195, Windows unit tests started failing, presumably after all the changes in our Windows AMI.
This PR should fix the Windows unit tests.

@iangmaia iangmaia self-assigned this Nov 19, 2025
@iangmaia iangmaia force-pushed the iangmaia/fix-windows-test branch from 48d49bc to 58e82ef Compare November 19, 2025 19:32
@iangmaia iangmaia marked this pull request as ready for review November 19, 2025 20:08
@iangmaia iangmaia requested review from AliSoftware and mokagio and removed request for AliSoftware November 19, 2025 20:29
Copy link
Contributor

@AliSoftware AliSoftware left a comment

Choose a reason for hiding this comment

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

Overall my suggestion for the fix is to just completely delete the prepare_windows_host_for_app_distribution.ps1 and its test from the repo.

Once we'll find the time to update all the repos that were still calling prepare_windows_host_for_app_distribution.ps1 in their .buildkite/commands/*.sh scripts and relied on the assumption that they might still be running on the base AMI and not our custom one, we'll have those repos just call setup_windows_code_signing.ps1 directly instead and bump their release-toolkit version to 6.0.0, at which point no repo using release-tookit >5.7.0 will call prepare_windows_host_for_app_distribution.ps1 and it won't be needed anymore (which was the whole point of creating our custom AMI in the first place after all.

iangmaia added a commit that referenced this pull request Nov 19, 2025
h/t @AliSoftware #196 (comment) -- this is now done in the AMI itself. Since this plugin is versioned and apps use a pinned version, we can safely remove the scripts.
@AliSoftware
Copy link
Contributor

Also feel free to make this PR target trunk instead so that it doesn't depend on mine.

Once we merge this PR I can rebase my git-crypt PR onto the new trunk as I continue working on it (as I want to test it on all our agents before I merge it, so it might take some time until it lands)

iangmaia and others added 6 commits November 20, 2025 09:56
h/t @AliSoftware #196 (comment) -- this is now done in the AMI itself. Since this plugin is versioned and apps use a pinned version, we can safely remove the scripts.
Co-authored-by: Olivier Halligon <olivier.halligon@automattic.com>
@iangmaia iangmaia force-pushed the iangmaia/fix-windows-test branch from ccb2cb7 to 1e40f20 Compare November 20, 2025 12:57
@iangmaia iangmaia changed the base branch from git-crypt-unlock to trunk November 20, 2025 12:57
@AliSoftware AliSoftware enabled auto-merge (squash) November 20, 2025 13:59
@AliSoftware AliSoftware merged commit 48fa7dc into trunk Nov 20, 2025
25 checks passed
@AliSoftware AliSoftware deleted the iangmaia/fix-windows-test branch November 20, 2025 14:06
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