From f6d4fb138c00ae85196deaa2e539b475f1bd87e7 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Fri, 17 Jan 2025 14:31:13 -0600 Subject: [PATCH 1/2] common.js - add windows-2025 --- common.js | 1 + dist/index.js | 1 + 2 files changed, 2 insertions(+) diff --git a/common.js b/common.js index cb2819d36..b9ff6138d 100644 --- a/common.js +++ b/common.js @@ -168,6 +168,7 @@ const GitHubHostedPlatforms = [ 'ubuntu-24.04-x64', 'windows-2019-x64', 'windows-2022-x64', + 'windows-2025-x64', ] // Precisely: whether we have builds for that platform and there are GitHub-hosted runners to test it diff --git a/dist/index.js b/dist/index.js index 6a9f10b44..54b4a95df 100644 --- a/dist/index.js +++ b/dist/index.js @@ -487,6 +487,7 @@ const GitHubHostedPlatforms = [ 'ubuntu-24.04-x64', 'windows-2019-x64', 'windows-2022-x64', + 'windows-2025-x64', ] // Precisely: whether we have builds for that platform and there are GitHub-hosted runners to test it From f6530735aeedaf3af885084620ba5139ca00d765 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Thu, 16 Jan 2025 12:53:17 -0600 Subject: [PATCH 2/2] test.yml -add windows-2025 --- .github/workflows/test.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b4637912e..54dcd992e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-13, macos-14, macos-15, windows-2019, windows-2022 ] + os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-13, macos-14, macos-15, windows-2019, windows-2022, windows-2025 ] ruby: [ '1.9', '2.0', '2.1', '2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', ruby-head, jruby, jruby-head, @@ -30,6 +30,9 @@ jobs: - { os: windows-2022, ruby: mingw } - { os: windows-2022, ruby: mswin } - { os: windows-2022, ruby: ucrt } + - { os: windows-2025, ruby: mingw } + - { os: windows-2025, ruby: mswin } + - { os: windows-2025, ruby: ucrt } - { os: ubuntu-24.04, ruby: asan } exclude: # https://github.com/ruby/setup-ruby/issues/496 @@ -54,18 +57,22 @@ jobs: # Windows (note: previews are not available on Windows) - { os: windows-2019, ruby: '1.9' } - { os: windows-2022, ruby: '1.9' } - - { os: windows-2019, ruby: '3.4' } # 3.4.0-preview2 - - { os: windows-2022, ruby: '3.4' } # 3.4.0-preview2 + - { os: windows-2025, ruby: '1.9' } - { os: windows-2019, ruby: debug } - { os: windows-2022, ruby: debug } + - { os: windows-2025, ruby: debug } - { os: windows-2019, ruby: truffleruby } - { os: windows-2022, ruby: truffleruby } + - { os: windows-2025, ruby: truffleruby } - { os: windows-2019, ruby: truffleruby-head } - { os: windows-2022, ruby: truffleruby-head } + - { os: windows-2025, ruby: truffleruby-head } - { os: windows-2019, ruby: truffleruby+graalvm } - { os: windows-2022, ruby: truffleruby+graalvm } + - { os: windows-2025, ruby: truffleruby+graalvm } - { os: windows-2019, ruby: truffleruby+graalvm-head } - { os: windows-2022, ruby: truffleruby+graalvm-head } + - { os: windows-2025, ruby: truffleruby+graalvm-head } name: ${{ matrix.os }} ${{ matrix.ruby }} runs-on: ${{ matrix.os }}