~jackweirdy/podman/+git/main:v4.9

Last commit made on 2024-05-06
Get this branch:
git clone -b v4.9 https://git.launchpad.net/~jackweirdy/podman/+git/main

Branch merges

Branch information

Name:
v4.9
Repository:
lp:~jackweirdy/podman/+git/main

Recent commits

8c1eefa... by "openshift-merge-bot[bot]" <148852131+openshift-merge-bot[bot]@users.noreply.github.com>

Merge pull request #22536 from cevich/v4.9_disable_machine

[v4.9] CI Maintenance: Disable machine tests

a2d8942... by Chris Evich

Disable failing bud test

This is a release-branch that will be unsupported before too long.
Test failing for unknown reason, not worth effort to debug.

Signed-off-by: Chris Evich <email address hidden>

5ab4b7b... by Chris Evich

CI Maintenance: Disable machine tests

Older versions of podman machine do not support being run against the
latest version of the machine VM images. As there is no built-in
provision to pin older machine VM image versions, these tests will
simply fail forever. Disable them.

Signed-off-by: Chris Evich <email address hidden>

69c8b6d... by "openshift-merge-bot[bot]" <148852131+openshift-merge-bot[bot]@users.noreply.github.com>

Merge pull request #22203 from ashley-cui/winaction

[CI:DOCS] [v4.9] Allow downgrade of WiX

9adad3a... by Ashley Cui <email address hidden>

[CI:DOCS] Allow downgrade of WiX

choco requires special flag to downgrade package.

Signed-off-by: Ashley Cui <email address hidden>

2158265... by "openshift-merge-bot[bot]" <148852131+openshift-merge-bot[bot]@users.noreply.github.com>

Merge pull request #22200 from ashley-cui/winaction

[CI:DOCS] [v4.9] Force WiX 3.11

3eda046... by Ashley Cui <email address hidden>

[CI:DOCS] Force WiX 3.11

Since all 4.9 versions expect 3.11 of the wix toolset, upgrading to 3.14 breaks builds of all other 4.9 podmans. Keep the v4.9 branch on 3.11 so we can build any of the 4.9 versions.

Signed-off-by: Ashley Cui <email address hidden>

33b21e7... by "openshift-merge-bot[bot]" <148852131+openshift-merge-bot[bot]@users.noreply.github.com>

Merge pull request #22199 from ashley-cui/winaction

[CI:DOCS] [v4.9] Fix windows installer action

23b0ca8... by Ashley Cui <email address hidden>

[CI:DOCS] Fix windows installer action

Force installed version of WiX toolset

Signed-off-by: Ashley Cui <email address hidden>

ca2099d... by "openshift-merge-bot[bot]" <148852131+openshift-merge-bot[bot]@users.noreply.github.com>

Merge pull request #22164 from mheon/bump_494

Bump to v4.9.4