chore(ci): update windows featurepack to 25h2 and 26h1#571
Open
gastoner wants to merge 1 commit into
Open
Conversation
📝 WalkthroughWalkthroughMultiple GitHub Actions E2E workflow YAML files update Windows featurepack matrix entries: several workflows replace ChangesWindows workflow matrix changes
🎯 2 (Simple) | ⏱️ ~8 minutes 🚥 Pre-merge checks | ✅ 2 | ❌ 3❌ Failed checks (2 warnings, 1 inconclusive)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
odockal
requested changes
Jun 4, 2026
Contributor
odockal
left a comment
odockal
left a comment
There was a problem hiding this comment.
Windows 10 does not have 25h2 feature pack.
Standardize all Windows CI workflows to use 25h2-ent featurepack, removing outdated 22h2-ent, 23h2-ent, and 24h2-ent entries along with their version-specific exclusion rules. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Evzen Gasta <evzen.ml@seznam.cz>
gastoner
force-pushed
the
windows_featurepack_update
branch
from
5884a91 to
ddc1e3e
Compare
gastoner
changed the title
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 6
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In @.github/workflows/podman-desktop-e2e-kubernetes.yaml:
- Around line 63-69: The matrix's windows-featurepack entries and excludes
conflict with the rollout target; update the windows-featurepack array (symbol:
windows-featurepack) to replace/remove '22h2-ent' and ensure it includes
'25h2-ent' as the standardized pack, and adjust the exclude rules (symbols:
exclude / windows-version / windows-featurepack) so any entries referencing
'22h2-ent' or the incorrect mappings for Windows 11/10 are removed or replaced
to reflect the new canonical mapping to '25h2-ent'.
In @.github/workflows/podman-desktop-e2e-nightly-windows-hyperv.yaml:
- Around line 65-70: The matrix currently lists windows-featurepack values
['22h2-ent', '26h1-ent'] and exclusion entries that force 26h1-ent on Windows 11
and keep 22h2-ent, but the workflows should converge on 25h2-ent; update the
windows-featurepack array to include '25h2-ent' (and remove or replace
'22h2-ent'/'26h1-ent' as per project baseline), and adjust the exclude mappings
so no platform is paired with the wrong featurepack (e.g., replace occurrences
of '22h2-ent' and '26h1-ent' in the exclude block with '25h2-ent' or remove
conflicting exclude entries) so the matrix targets '25h2-ent' consistently.
In @.github/workflows/podman-desktop-e2e-nightly-windows-wsl.yaml:
- Around line 65-70: The WSL nightly matrix uses the wrong Windows featurepack
values; update the matrix entries that reference windows-featurepack (the array
and the exclude mappings) to use the standardized target featurepack "25h2-ent"
instead of "26h1-ent" or "22h2-ent" so the matrix aligns with the documented
target state; specifically change the windows-featurepack list and adjust the
two exclude entries so they reflect proper pairings with "25h2-ent" (update the
array under windows-featurepack and the exclude mappings that reference
windows-featurepack).
In @.github/workflows/podman-desktop-e2e-stress-ui-windows.yaml:
- Around line 79-80: The workflow sets windows-featurepack to '26h1-ent' but
should be aligned to the project's baseline '25h2-ent'; update the value for the
windows-featurepack key (the line containing windows-featurepack: ['26h1-ent'])
to use '25h2-ent' so the podman-desktop-e2e-stress-ui-windows workflow targets
the same Windows featurepack as the rest of CI.
In @.github/workflows/podman-desktop-e2e-windows.yaml:
- Around line 62-69: The matrix still lists '22h2-ent' in windows-featurepack
and the conditional excludes route debug=true to '22h2-ent'; update the matrix
so windows-featurepack only contains '25h2-ent' (remove '22h2-ent') and change
the conditional exclude that maps debug runs to use windows-featurepack
'25h2-ent' (and windows-version '11') so debug=true selects the '11' +
'25h2-ent' combination; also remove any exclude entry that specifically
references '22h2-ent' to avoid routing debug runs to the deprecated featurepack.
In @.github/workflows/podman-e2e-windows.yaml:
- Around line 29-34: The CI matrix still includes '22h2-ent' so the workflow
isn't standardized to '25h2-ent'; update the matrix.windows-featurepack entry to
only list '25h2-ent' (remove '22h2-ent') and remove or update the corresponding
exclude rows that reference '22h2-ent' and the conflicting entries pairing
windows-version: '10' with windows-featurepack: '22h2-ent' and windows-version:
'11' with windows-featurepack: '22h2-ent', ensuring matrix.windows-featurepack
is passed consistently (as used by create-instance/action.yml) and no remaining
references to '22h2-ent' remain in the matrix or excludes.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 51f1e30e-825e-43e9-8ad3-dc2555423c79
📒 Files selected for processing (8)
.github/workflows/desktop-e2e-podman-windows-matrix.yaml.github/workflows/podman-desktop-e2e-kubernetes.yaml.github/workflows/podman-desktop-e2e-nightly-windows-hyperv.yaml.github/workflows/podman-desktop-e2e-nightly-windows-wsl.yaml.github/workflows/podman-desktop-e2e-stress-ui-windows.yaml.github/workflows/podman-desktop-e2e-windows.yaml.github/workflows/podman-e2e-windows.yaml.github/workflows/prerelease-desktop-e2e-debug-job-windows.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
- .github/workflows/desktop-e2e-podman-windows-matrix.yaml
Comment on lines
+63
to
69
| windows-featurepack: ['22h2-ent', '26h1-ent'] | ||
| podman-provider: ['wsl', 'hyperv'] | ||
| exclude: | ||
| - windows-version: '10' | ||
| windows-featurepack: '25h2-ent' | ||
| windows-featurepack: '26h1-ent' | ||
| - windows-version: '11' | ||
| windows-featurepack: '22h2-ent' |
There was a problem hiding this comment.
Featurepack mapping conflicts with the stated rollout target.
Line 63 and Line 67 move Windows 11 coverage to 26h1-ent while keeping 22h2-ent in the matrix, which diverges from PR/issue scope to standardize Windows CI on 25h2-ent and remove outdated packs.
Suggested alignment diff
- windows-featurepack: ['22h2-ent', '26h1-ent']
+ windows-featurepack: ['25h2-ent']
podman-provider: ['wsl', 'hyperv']
exclude:
- windows-version: '10'
- windows-featurepack: '26h1-ent'
- - windows-version: '11'
- windows-featurepack: '22h2-ent'
+ windows-featurepack: '25h2-ent'📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| windows-featurepack: ['22h2-ent', '26h1-ent'] | |
| podman-provider: ['wsl', 'hyperv'] | |
| exclude: | |
| - windows-version: '10' | |
| windows-featurepack: '25h2-ent' | |
| windows-featurepack: '26h1-ent' | |
| - windows-version: '11' | |
| windows-featurepack: '22h2-ent' | |
| windows-featurepack: ['25h2-ent'] | |
| podman-provider: ['wsl', 'hyperv'] | |
| exclude: | |
| - windows-version: '10' | |
| windows-featurepack: '25h2-ent' |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In @.github/workflows/podman-desktop-e2e-kubernetes.yaml around lines 63 - 69,
The matrix's windows-featurepack entries and excludes conflict with the rollout
target; update the windows-featurepack array (symbol: windows-featurepack) to
replace/remove '22h2-ent' and ensure it includes '25h2-ent' as the standardized
pack, and adjust the exclude rules (symbols: exclude / windows-version /
windows-featurepack) so any entries referencing '22h2-ent' or the incorrect
mappings for Windows 11/10 are removed or replaced to reflect the new canonical
mapping to '25h2-ent'.
Comment on lines
+65
to
70
| windows-featurepack: ['22h2-ent', '26h1-ent'] | ||
| exclude: | ||
| - windows-version: '10' | ||
| windows-featurepack: '25h2-ent' | ||
| windows-featurepack: '26h1-ent' | ||
| - windows-version: '11' | ||
| windows-featurepack: '22h2-ent' |
There was a problem hiding this comment.
Nightly Hyper-V matrix is targeting the wrong featurepack baseline.
Line 65/Line 68 now enforce Windows 11 on 26h1-ent and retain 22h2-ent, which conflicts with the requirement to converge workflows on 25h2-ent.
Suggested alignment diff
- windows-featurepack: ['22h2-ent', '26h1-ent']
+ windows-featurepack: ['25h2-ent']
exclude:
- windows-version: '10'
- windows-featurepack: '26h1-ent'
- - windows-version: '11'
- windows-featurepack: '22h2-ent'
+ windows-featurepack: '25h2-ent'📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| windows-featurepack: ['22h2-ent', '26h1-ent'] | |
| exclude: | |
| - windows-version: '10' | |
| windows-featurepack: '25h2-ent' | |
| windows-featurepack: '26h1-ent' | |
| - windows-version: '11' | |
| windows-featurepack: '22h2-ent' | |
| windows-featurepack: ['25h2-ent'] | |
| exclude: | |
| - windows-version: '10' | |
| windows-featurepack: '25h2-ent' |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In @.github/workflows/podman-desktop-e2e-nightly-windows-hyperv.yaml around
lines 65 - 70, The matrix currently lists windows-featurepack values
['22h2-ent', '26h1-ent'] and exclusion entries that force 26h1-ent on Windows 11
and keep 22h2-ent, but the workflows should converge on 25h2-ent; update the
windows-featurepack array to include '25h2-ent' (and remove or replace
'22h2-ent'/'26h1-ent' as per project baseline), and adjust the exclude mappings
so no platform is paired with the wrong featurepack (e.g., replace occurrences
of '22h2-ent' and '26h1-ent' in the exclude block with '25h2-ent' or remove
conflicting exclude entries) so the matrix targets '25h2-ent' consistently.
Comment on lines
+65
to
70
| windows-featurepack: ['22h2-ent', '26h1-ent'] | ||
| exclude: | ||
| - windows-version: '10' | ||
| windows-featurepack: '25h2-ent' | ||
| windows-featurepack: '26h1-ent' | ||
| - windows-version: '11' | ||
| windows-featurepack: '22h2-ent' |
There was a problem hiding this comment.
WSL nightly matrix diverges from required featurepack version.
Line 65 and Line 68 shift coverage to 26h1-ent and keep 22h2-ent; this does not match the documented target state (25h2-ent standardized).
Suggested alignment diff
- windows-featurepack: ['22h2-ent', '26h1-ent']
+ windows-featurepack: ['25h2-ent']
exclude:
- windows-version: '10'
- windows-featurepack: '26h1-ent'
- - windows-version: '11'
- windows-featurepack: '22h2-ent'
+ windows-featurepack: '25h2-ent'📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| windows-featurepack: ['22h2-ent', '26h1-ent'] | |
| exclude: | |
| - windows-version: '10' | |
| windows-featurepack: '25h2-ent' | |
| windows-featurepack: '26h1-ent' | |
| - windows-version: '11' | |
| windows-featurepack: '22h2-ent' | |
| windows-featurepack: ['25h2-ent'] | |
| exclude: | |
| - windows-version: '10' | |
| windows-featurepack: '25h2-ent' |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In @.github/workflows/podman-desktop-e2e-nightly-windows-wsl.yaml around lines
65 - 70, The WSL nightly matrix uses the wrong Windows featurepack values;
update the matrix entries that reference windows-featurepack (the array and the
exclude mappings) to use the standardized target featurepack "25h2-ent" instead
of "26h1-ent" or "22h2-ent" so the matrix aligns with the documented target
state; specifically change the windows-featurepack list and adjust the two
exclude entries so they reflect proper pairings with "25h2-ent" (update the
array under windows-featurepack and the exclude mappings that reference
windows-featurepack).
Comment on lines
79
to
+80
| windows-version: ['11'] | ||
| windows-featurepack: ['24h2-ent'] | ||
| windows-featurepack: ['26h1-ent'] |
There was a problem hiding this comment.
Stress UI workflow is pinned to 26h1-ent instead of the required 25h2-ent.
Line 80 should align with the same target featurepack baseline as the rest of the Windows CI rollout.
Suggested alignment diff
- windows-featurepack: ['26h1-ent']
+ windows-featurepack: ['25h2-ent']📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| windows-version: ['11'] | |
| windows-featurepack: ['24h2-ent'] | |
| windows-featurepack: ['26h1-ent'] | |
| windows-version: ['11'] | |
| windows-featurepack: ['25h2-ent'] |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In @.github/workflows/podman-desktop-e2e-stress-ui-windows.yaml around lines 79
- 80, The workflow sets windows-featurepack to '26h1-ent' but should be aligned
to the project's baseline '25h2-ent'; update the value for the
windows-featurepack key (the line containing windows-featurepack: ['26h1-ent'])
to use '25h2-ent' so the podman-desktop-e2e-stress-ui-windows workflow targets
the same Windows featurepack as the rest of CI.
Comment on lines
+62
to
+69
| windows-featurepack: ['22h2-ent', '25h2-ent'] | ||
| exclude: | ||
| - windows-version: '10' | ||
| windows-featurepack: '23h2-ent' | ||
| windows-featurepack: '25h2-ent' | ||
| - windows-version: '11' | ||
| windows-featurepack: '22h2-ent' | ||
| - windows-version: ${{ (github.event.inputs.debug && github.event.inputs.debug == 'true') && '11' || 'N/A' }} | ||
| windows-featurepack: ${{ (github.event.inputs.debug && github.event.inputs.debug == 'true') && '23h2-ent' || 'N/A' }} | ||
| windows-featurepack: ${{ (github.event.inputs.debug && github.event.inputs.debug == 'true') && '25h2-ent' || 'N/A' }} |
There was a problem hiding this comment.
Matrix logic still routes debug runs to deprecated 22h2-ent instead of the target 25h2-ent.
Line 62 keeps 22h2-ent, and the excludes on Lines 64–69 make debug=true run only windows-version: '10' + windows-featurepack: '22h2-ent'. That contradicts the PR objective to standardize on 25h2-ent and remove older featurepacks.
Suggested fix
matrix:
- windows-version: ['10','11']
- windows-featurepack: ['22h2-ent', '25h2-ent']
+ windows-version: ['11']
+ windows-featurepack: ['25h2-ent']
exclude:
- - windows-version: '10'
- windows-featurepack: '25h2-ent'
- - windows-version: '11'
- windows-featurepack: '22h2-ent'
- - windows-version: ${{ (github.event.inputs.debug && github.event.inputs.debug == 'true') && '11' || 'N/A' }}
- windows-featurepack: ${{ (github.event.inputs.debug && github.event.inputs.debug == 'true') && '25h2-ent' || 'N/A' }}
+ - windows-version: ${{ (github.event.inputs.debug && github.event.inputs.debug == 'true') && '11' || 'N/A' }}
+ windows-featurepack: ${{ (github.event.inputs.debug && github.event.inputs.debug == 'true') && '25h2-ent' || 'N/A' }}🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In @.github/workflows/podman-desktop-e2e-windows.yaml around lines 62 - 69, The
matrix still lists '22h2-ent' in windows-featurepack and the conditional
excludes route debug=true to '22h2-ent'; update the matrix so
windows-featurepack only contains '25h2-ent' (remove '22h2-ent') and change the
conditional exclude that maps debug runs to use windows-featurepack '25h2-ent'
(and windows-version '11') so debug=true selects the '11' + '25h2-ent'
combination; also remove any exclude entry that specifically references
'22h2-ent' to avoid routing debug runs to the deprecated featurepack.
Comment on lines
+29
to
34
| windows-featurepack: ['22h2-ent', '25h2-ent'] | ||
| exclude: | ||
| - windows-version: '10' | ||
| windows-featurepack: '24h2-ent' | ||
| windows-featurepack: '25h2-ent' | ||
| - windows-version: '11' | ||
| windows-featurepack: '22h2-ent' |
There was a problem hiding this comment.
22h2-ent is still active in this matrix, so the workflow is not fully standardized to 25h2-ent.
This matrix still schedules windows-version: '10' with windows-featurepack: '22h2-ent', which conflicts with the PR objective to remove outdated featurepacks and standardize on 25h2-ent. Since matrix.windows-featurepack is passed directly to provisioning (.github/actions/create-instance/action.yml:32-143), this keeps mixed featurepack coverage in CI.
Suggested direction
strategy:
fail-fast: false
matrix:
- windows-version: ['10','11']
- windows-featurepack: ['22h2-ent', '25h2-ent']
- exclude:
- - windows-version: '10'
- windows-featurepack: '25h2-ent'
- - windows-version: '11'
- windows-featurepack: '22h2-ent'
+ windows-version: ['11']
+ windows-featurepack: ['25h2-ent']🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In @.github/workflows/podman-e2e-windows.yaml around lines 29 - 34, The CI
matrix still includes '22h2-ent' so the workflow isn't standardized to
'25h2-ent'; update the matrix.windows-featurepack entry to only list '25h2-ent'
(remove '22h2-ent') and remove or update the corresponding exclude rows that
reference '22h2-ent' and the conflicting entries pairing windows-version: '10'
with windows-featurepack: '22h2-ent' and windows-version: '11' with
windows-featurepack: '22h2-ent', ensuring matrix.windows-featurepack is passed
consistently (as used by create-instance/action.yml) and no remaining references
to '22h2-ent' remain in the matrix or excludes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Standardize all Windows CI workflows to use 25h2-ent featurepack, removing outdated 22h2-ent, 23h2-ent, and 24h2-ent entries along with their version-specific exclusion rules.
Closes #535