Skip to content

Commit 0f05460

Browse files
authored
CI: Add Windows 11 Arm (#5384)
**Which issue(s) this PR fixes**: N/A **What this PR does / why we need it**: Prepare to support Windows 11 on Arm. Although a test for `fluent-ctl` command is currently skipped due to chef/ffi-win32-extensions#14, all other tests pass on it. `fluent-ctl` will also work if you remove the version restriction in ffi-win32-extensions.gemspec by running it without bundler (fluent-pakcage doesn't use it in runtime). **Docs Changes**: N/A **Release Note**: Same with the title --------- Signed-off-by: Takuro Ashie <ashie@clear-code.com>
1 parent 3e53f56 commit 0f05460

3 files changed

Lines changed: 8 additions & 2 deletions

File tree

.github/workflows/test-ruby-head.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
17+
os: ['ubuntu-latest', 'macos-latest', 'windows-latest', 'windows-11-arm']
1818
ruby-version: ['head']
1919
env:
2020
RUBYOPT: "--disable-frozen_string_literal"

.github/workflows/test.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,13 @@ jobs:
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
29+
os: ['ubuntu-latest', 'macos-latest', 'windows-latest', 'windows-11-arm']
3030
ruby-version: ['4.0', '3.4', '3.3', '3.2']
31+
exclude:
32+
- os: 'windows-11-arm'
33+
ruby-version: '3.3'
34+
- os: 'windows-11-arm'
35+
ruby-version: '3.2'
3136
env:
3237
RUBYOPT: "--disable-frozen_string_literal"
3338
name: Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}

test/command/test_ctl.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ def test_commands(data)
4646
"reload" => ["reload", "USR2"])
4747
def test_commands_with_winsvcname(data)
4848
omit "Only for Windows" unless Fluent.windows?
49+
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")
4950

5051
command, event_suffix = data
5152
event_name = "testfluentdwinsvc"

0 commit comments

Comments
 (0)