Skip to content

Conversation

@l0rd
Copy link
Member

@l0rd l0rd commented Oct 6, 2025

This PR points the WiX toolset version to 5.0.2 to avoid using version 6 when building the installer

The WiX version should be consistent with the one that is specified to
build the Podman installer.

Moreover the WiX toolset licensing has changed with the release of
version 6 and we should not upgrade to it unless Podman organization
becomes a sponsor of the project:

containers/podman#27042

Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
@l0rd
Copy link
Member Author

l0rd commented Oct 6, 2025

@Luap99 PTAL

Comment on lines 38 to 46
# Add a WSL configuration file
# The `kernelBootTimeout` configuration is to prevent CI/CD flakes
# See https://github.com/microsoft/WSL/issues/13301#issuecomment-3367452109
$wslConfigPath = "$env:UserProfile\.wslconfig"
$wslConfigContent = @"
[wsl2]
kernelBootTimeout=300000 # 5 minutes
"@
Set-Content -Path $wslConfigPath -Value $wslConfigContent
Copy link
Member

Choose a reason for hiding this comment

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

This is per user right due UserProfile?

I am not sure about the windows build process at all but I am not sure if this here then runs as the same user as our podman tests. Would it be easier to configure in the podman setup instead where we know we run under the correct user https://github.com/containers/podman/blob/main/contrib/cirrus/win-podman-machine-test.ps1?

Copy link
Member Author

@l0rd l0rd Oct 6, 2025

Choose a reason for hiding this comment

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

Yes you are right, it's a per user configuration and the user Administrator is created later so it may be ineffective. I have created a corresponding PR podman side and removed the commit from this PR.

@l0rd l0rd changed the title Windows image: use WiX version 5.0.2 and WSL kernelBootTimeout config Windows image: use WiX version 5.0.2 Oct 6, 2025
@Luap99
Copy link
Member

Luap99 commented Oct 6, 2025

Thanks @l0rd

@timcoding1988 can you cherry-pick this commit into your PR #417 since we can only have "one image build" (PR) active at a time anyway so best to fold this into your existing build PR.

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.

2 participants