From 0e04887d3b9d3a6016739e965d1ad6a6a8280465 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 9 Jul 2025 22:27:08 +0200 Subject: [PATCH 1/2] CI: Replace Windows 2019->2025 runners --- .github/workflows/acceptance_tests.yml | 1 + .github/workflows/integration_tests.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/acceptance_tests.yml b/.github/workflows/acceptance_tests.yml index 34dc799bb..a4dd4a923 100644 --- a/.github/workflows/acceptance_tests.yml +++ b/.github/workflows/acceptance_tests.yml @@ -20,6 +20,7 @@ jobs: matrix: os: - windows-2022 + - windows-2025 - ubuntu-22.04 - ubuntu-24.04 - macos-13 diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml index 45282d61c..c1f6fc155 100644 --- a/.github/workflows/integration_tests.yaml +++ b/.github/workflows/integration_tests.yaml @@ -27,8 +27,8 @@ jobs: - {os: ubuntu-22.04, ruby: '3.2'} # with openssl 3 - {os: ubuntu-22.04, ruby: 'jruby-9.3.14.0'} - {os: ubuntu-latest, ruby: 'jruby-9.4.8.0'} - - {os: windows-2022, ruby: '2.7'} - - {os: windows-2022, ruby: '3.2'} # with openssl 3 + - {os: windows-2025, ruby: '2.7'} + - {os: windows-2025, ruby: '3.2'} # with openssl 3 runs-on: ${{ matrix.cfg.os }} env: BUNDLE_SET: 'with integration' From a82ae1d847996bbea3b006bcf93ae473bb6edfe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Wed, 9 Jul 2025 12:15:13 -1000 Subject: [PATCH 2/2] Fix pre-suite action > facter/.github/actions/presuite.rb:40:in `platform_with_options': undefined method `include?' for nil:NilClass (NoMethodError) > return "\"#{platform}{hypervisor=none,hostname=localhost,is_cygwin=false}\"" if platform.include? 'windows' --- .github/actions/presuite.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/presuite.rb b/.github/actions/presuite.rb index be98c8f89..2c9b39408 100644 --- a/.github/actions/presuite.rb +++ b/.github/actions/presuite.rb @@ -33,6 +33,7 @@ def beaker_platform 'windows-2016' => 'windows2016-64a', 'windows-2019' => 'windows2019-64a', 'windows-2022' => 'windows2022-64a', + 'windows-2025' => 'windows2025-64a', }[HOST_PLATFORM] end