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

Windows: install dotnet and latest wix #354

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented May 3, 2024

wix3 is EOL and choco doesn't support installing wix > 3.14.

So, this commit installs the dotnet runtime and uses dotnet to install
the latest wix in the windows image.

Resolves: RUN-2055

@lsm5 lsm5 added no_skopeo_cidev Don't build the skopeo_cidev image no_prior-fedora Don't build any prior-fedora images no_fedora Don't build any fedora images no_fedora-aws Don't build any fedora-aws images no_fedora-aws-arm64 Don't build any fedora-aws-arm64 images no_build-push Don't build the build-push image no_fedora_podman Don't build the fedora_podman image no_prior-fedora_podman Don't build the prior-fedora_podman image no_fedora-netavark Don't build the fedora-netavark image no_fedora-netavark-aws-arm64 Don't build the fedora-netavark-aws image no_fedora-podman-py Don't build the fedora-podman-py image no_image-builder Don't build the image-builder image no_fedora-podman-aws-arm64 Don't build the fedora-podman-aws image no_debian Don't build the debian image no_rawhide Don't build the rawhide image labels May 3, 2024
@lsm5 lsm5 force-pushed the dotnet branch 6 times, most recently from 3561082 to ff3089d Compare May 7, 2024 17:55
Copy link

github-actions bot commented May 7, 2024

Cirrus CI build successful. Found built image names and IDs:

Stage Image Name IMAGE_SUFFIX
cache win-server-wsl c20240507t175445z-f40f39d13

@lsm5 lsm5 removed no_skopeo_cidev Don't build the skopeo_cidev image no_prior-fedora Don't build any prior-fedora images no_fedora Don't build any fedora images no_fedora-aws Don't build any fedora-aws images no_fedora-aws-arm64 Don't build any fedora-aws-arm64 images no_build-push Don't build the build-push image no_fedora_podman Don't build the fedora_podman image labels May 7, 2024
Comment on lines 27 to 34
# dotnet is required for wixtoolset
# Allowing chocolaty to install dotnet breaks in an entirely
# non-debuggable way. Workaround this by installing it as
# a server-feature first.
Install-WindowsFeature -Name Net-Framework-Core; Check-Exit
#Install-WindowsFeature -Name Net-Framework-Core; Check-Exit

# Install wixtoolset for installer build & test.
retryInstall wixtoolset; Check-Exit
#retryInstall wixtoolset; Check-Exit
Copy link
Member

Choose a reason for hiding this comment

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

Assuming what you added above works, my preference would be to just delete all this commented out stuff. Otherwise anybody else finding this is going to wonder "why" - which isn't commented anywhere. It's okay to rely on git to remember these commands if we ever need them again.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ack, I'll remove those after testing the built image in the podman windows installer PR. Thanks a lot

Copy link
Member

@cevich cevich left a comment

Choose a reason for hiding this comment

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

LGTM - just one minor comment.

@cevich cevich removed the no_fedora-podman-aws-arm64 Don't build the fedora-podman-aws image label May 9, 2024
@cevich
Copy link
Member

cevich commented May 9, 2024

Assuming you want to build AWS arm Fedora.

@lsm5 lsm5 force-pushed the dotnet branch 2 times, most recently from cb66bae to 339881f Compare May 9, 2024 16:22
@lsm5
Copy link
Member Author

lsm5 commented May 9, 2024

Win-images build successful, now to wait to test the new image id in the podman PR.

Copy link

github-actions bot commented May 9, 2024

Cirrus CI build successful. Found built image names and IDs:

Stage Image Name IMAGE_SUFFIX
base debian do-not-use
base fedora do-not-use
base fedora-aws do-not-use
base fedora-aws-arm64 do-not-use
base image-builder do-not-use
base prior-fedora do-not-use
cache build-push c20240509t162134z-f40f39d13
cache debian c20240509t162134z-f40f39d13
cache fedora c20240509t162134z-f40f39d13
cache fedora-aws c20240509t162134z-f40f39d13
cache fedora-netavark c20240509t162134z-f40f39d13
cache fedora-netavark-aws-arm64 c20240509t162134z-f40f39d13
cache fedora-podman-aws-arm64 c20240509t162134z-f40f39d13
cache fedora-podman-py c20240509t162134z-f40f39d13
cache prior-fedora c20240509t162134z-f40f39d13
cache rawhide c20240509t162134z-f40f39d13
cache win-server-wsl c20240509t162134z-f40f39d13


# Install wixtoolset for installer build & test.
retryInstall wixtoolset; Check-Exit
# Install dotnet
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is an "add one to X" comment. If you need to repush, could you please use comments to explain the why, not the what? Even something like the previous comment ("needed for wixtoolset") would be better. Remember that this code may need to be maintained some day by non-Windows-experts. They might be reassured by a short sentence or two describing what these things are and why they're needed.

Copy link
Member Author

Choose a reason for hiding this comment

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

will do

Copy link
Member Author

Choose a reason for hiding this comment

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

@edsantiago addressed this in the latest update. PTAL.

@edsantiago
Copy link
Collaborator

Comparing against the versions in podman right now:

  • 20240509t162134z-f40f39d13
  • 20240506t132946z-f40f39d13 ⇑ (built in Fedora40 #349)
debian prior-fedora fedora fedora-aws rawhide
kernel 6.7.12-1 6.8.8-200 6.8.9-300 6.8.8-300 6.9.0-0.rc7.20240507gitdccb07f2914c.59
6.9.0-0.rc6.20240503gitf03359bca01b.56 ⇑
golang 2:1.22~3 1.21.9-1 1.22.3-1 1.22.2-1 1.22.2-3
1.22.2-1 ⇑

@lsm5
Copy link
Member Author

lsm5 commented May 9, 2024

Comparing against the versions in podman right now:

  • 20240509t162134z-f40f39d13
  • 20240506t132946z-f40f39d13 ⇑ (built in Fedora40 #349)

debian prior-fedora fedora fedora-aws rawhide
kernel 6.7.12-1 6.8.8-200 6.8.9-300 6.8.8-300 6.9.0-0.rc7.20240507gitdccb07f2914c.59
6.9.0-0.rc6.20240503gitf03359bca01b.56 ⇑
golang 2:1.22~3 1.21.9-1 1.22.3-1 1.22.2-1 1.22.2-3
1.22.2-1 ⇑

Are the new rawhide kernel and fedora golang versions going to be trouble?

@edsantiago
Copy link
Collaborator

Very very unlikely.

lsm5 added a commit to lsm5/podman that referenced this pull request May 9, 2024
Replace choco with dotnet for wix installation as choco doesn't have
anything newer than v3.14.
Ref: https://community.chocolatey.org/packages/wixtoolset

This commit also uses an updated windows image that installs the latest
wix using the dotnet runtime.
Ref: containers/automation_images#354

Resolves: RUN-2055

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@edsantiago
Copy link
Collaborator

Better, thank you!

@lsm5 lsm5 changed the title Windows: install dotnet and wix Windows: install dotnet and latest wix May 9, 2024
@lsm5
Copy link
Member Author

lsm5 commented May 9, 2024

hmm, looks like I need to add an additional package https://www.nuget.org/packages/WixToolset.Heat in the windows image too. ughhhh

Copy link

github-actions bot commented May 9, 2024

Cirrus CI build successful. Found built image names and IDs:

Stage Image Name IMAGE_SUFFIX
base debian do-not-use
base fedora do-not-use
base fedora-aws do-not-use
base fedora-aws-arm64 do-not-use
base image-builder do-not-use
base prior-fedora do-not-use
cache build-push c20240509t185622z-f40f39d13
cache debian c20240509t185622z-f40f39d13
cache fedora c20240509t185622z-f40f39d13
cache fedora-aws c20240509t185622z-f40f39d13
cache fedora-netavark c20240509t185622z-f40f39d13
cache fedora-netavark-aws-arm64 c20240509t185622z-f40f39d13
cache fedora-podman-aws-arm64 c20240509t185622z-f40f39d13
cache fedora-podman-py c20240509t185622z-f40f39d13
cache prior-fedora c20240509t185622z-f40f39d13
cache rawhide c20240509t185622z-f40f39d13
cache win-server-wsl c20240509t185622z-f40f39d13

@edsantiago
Copy link
Collaborator

(No package diffs against previous build)

@cevich cevich marked this pull request as ready for review May 9, 2024 20:39
@cevich
Copy link
Member

cevich commented May 9, 2024

FYI: Since Ed and I will both be gone Friday, and myself all of next week I said it's okay for Lokesh to merge this PR assuming the run through podman CI passes.

lsm5 added a commit to lsm5/podman that referenced this pull request May 10, 2024
Replace choco with dotnet for wix installation as choco doesn't have
anything newer than v3.14.
Ref: https://community.chocolatey.org/packages/wixtoolset

This commit also uses an updated windows image that installs the latest
wix using the dotnet runtime.
Ref: containers/automation_images#354

Resolves: RUN-2055

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
lsm5 added a commit to lsm5/podman that referenced this pull request May 10, 2024
Replace choco with dotnet for wix installation as choco doesn't have
anything newer than v3.14.
Ref: https://community.chocolatey.org/packages/wixtoolset

This commit also uses an updated windows image that installs the latest
wix using the dotnet runtime.
Ref: containers/automation_images#354

Resolves: RUN-2055

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
wix3 is EOL and choco doesn't support installing wix > 3.14.

So, this commit installs the `dotnet` runtime and uses dotnet to install
the latest wix in the windows image.

Resolves: RUN-2055

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Copy link

Cirrus CI build successful. Found built image names and IDs:

Stage Image Name IMAGE_SUFFIX
base debian do-not-use
base fedora do-not-use
base fedora-aws do-not-use
base fedora-aws-arm64 do-not-use
base image-builder do-not-use
base prior-fedora do-not-use
cache build-push c20240510t174901z-f40f39d13
cache debian c20240510t174901z-f40f39d13
cache fedora c20240510t174901z-f40f39d13
cache fedora-aws c20240510t174901z-f40f39d13
cache fedora-netavark c20240510t174901z-f40f39d13
cache fedora-netavark-aws-arm64 c20240510t174901z-f40f39d13
cache fedora-podman-aws-arm64 c20240510t174901z-f40f39d13
cache fedora-podman-py c20240510t174901z-f40f39d13
cache prior-fedora c20240510t174901z-f40f39d13
cache rawhide c20240510t174901z-f40f39d13
cache win-server-wsl c20240510t174901z-f40f39d13

@edsantiago
Copy link
Collaborator

debian prior-fedora fedora fedora-aws rawhide
kernel 6.7.12-1 6.8.9-200 6.8.9-300 6.8.9-300 6.9.0-0.rc7.20240509git45db3ab70092.61
6.8.8-200 ⇑ 6.8.8-300 ⇑ 6.9.0-0.rc7.20240507gitdccb07f2914c.59 ⇑
golang 2:1.22~3 1.21.9-1 1.22.3-1 1.22.2-1 1.22.3-1
1.22.2-3 ⇑
systemd 255.5-1 254.10-1 255.6-1 255.4-1 255.5-1
255.4-1 ⇑

@edsantiago
Copy link
Collaborator

@lsm5 I have no way to know if this build is successful for the purposes you intend. If you're happy with it, feel free to merge.

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.

None yet

3 participants