diff --git a/.github/workflows/test-ruby-head.yml b/.github/workflows/test-ruby-head.yml index c5d6369909..02793cc047 100644 --- a/.github/workflows/test-ruby-head.yml +++ b/.github/workflows/test-ruby-head.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] + os: ['ubuntu-latest', 'macos-latest', 'windows-latest', 'windows-11-arm'] ruby-version: ['head'] env: RUBYOPT: "--disable-frozen_string_literal" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ef60547749..e1cd1092b4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,8 +26,13 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] + os: ['ubuntu-latest', 'macos-latest', 'windows-latest', 'windows-11-arm'] ruby-version: ['4.0', '3.4', '3.3', '3.2'] + exclude: + - os: 'windows-11-arm' + ruby-version: '3.3' + - os: 'windows-11-arm' + ruby-version: '3.2' env: RUBYOPT: "--disable-frozen_string_literal" name: Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }} diff --git a/test/command/test_ctl.rb b/test/command/test_ctl.rb index f9adc19c8b..902a0b25b6 100644 --- a/test/command/test_ctl.rb +++ b/test/command/test_ctl.rb @@ -46,6 +46,7 @@ def test_commands(data) "reload" => ["reload", "USR2"]) def test_commands_with_winsvcname(data) omit "Only for Windows" unless Fluent.windows? + omit "Need ffi 1.17.3 or later but blocked by https://github.com/chef/ffi-win32-extensions/issues/14" if Gem::Version.new(FFI::VERSION) < Gem::Version.new("1.17.3") command, event_suffix = data event_name = "testfluentdwinsvc"