Skip to content

Commit dd8e1db

Browse files
authored
Merge pull request #1 from kenhys/add-actions
Revise CI ready and use GitHub Actions
2 parents a658e9b + 5306778 commit dd8e1db

File tree

4 files changed

+36
-9
lines changed

4 files changed

+36
-9
lines changed

.github/workflows/ci.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Testing on Ubuntu
2+
on:
3+
push:
4+
pull_request:
5+
workflow_dispatch:
6+
7+
concurrency:
8+
group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}
9+
cancel-in-progress: true
10+
11+
permissions: read-all
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
ruby:
20+
- 3.2
21+
- 3.3
22+
- 3.4
23+
name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
24+
steps:
25+
- uses: actions/checkout@v4
26+
- uses: ruby/setup-ruby@v1
27+
with:
28+
ruby-version: ${{ matrix.ruby }}
29+
- name: unit testing
30+
run: |
31+
bundle install --jobs 4 --retry 3
32+
bundle exec rake test

fluent-plugin-obsolete-plugins.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
2020
spec.test_files = test_files
2121
spec.require_paths = ["lib"]
2222

23-
spec.add_development_dependency "bundler", "~> 1.14"
23+
spec.add_development_dependency "bundler", "~> 2.4"
2424
spec.add_development_dependency "rake", "~> 12.0"
2525
spec.add_development_dependency "test-unit", "~> 3.0"
2626
spec.add_development_dependency "test-unit-rr"

lib/fluent/plugin/filter_obsolete_plugins.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def configure(conf)
3838

3939
obsolete_plugins = Gem.loaded_specs.keys & @obsolete_plugins.keys
4040
obsolete_plugins.each do |name|
41-
$log.warn("#{name} is obsolete: #{@obsolete_plugins[name].chomp}")
41+
log.warn("#{name} is obsolete: #{@obsolete_plugins[name].chomp}")
4242
end
4343
if @raise_error && !obsolete_plugins.empty?
4444
raise Fluent::ConfigError, "Detected obsolete plugins"

test/plugin/test_filter_obsolete_plugins.rb

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ObsoletePluginsFilterTest < Test::Unit::TestCase
2323
d.feed({ message: "This is test message." })
2424
end
2525
assert_equal([{ message: "This is test message." }], d.filtered_records)
26-
assert_equal([], $log.logs)
26+
assert_equal([], d.logs)
2727
end
2828

2929
test "obsolete plugins" do
@@ -42,7 +42,7 @@ class ObsoletePluginsFilterTest < Test::Unit::TestCase
4242
"#{@time} [warn]: fluent-plugin-tail-multiline is obsolete: Merged in in_tail in Fluentd v0.10.45. [fluent/fluentd#269](https://github.com/fluent/fluentd/issues/269)\n",
4343
"#{@time} [warn]: fluent-plugin-hostname is obsolete: Use [filter\\_record\\_transformer](http://docs.fluentd.org/v0.12/articles/filter_record_transformer) instead.\n"
4444
]
45-
assert_equal(expected_logs, $log.logs)
45+
assert_equal(expected_logs, d.logs)
4646
end
4747

4848
test "raise error when detect obsolete plugins" do
@@ -56,11 +56,6 @@ class ObsoletePluginsFilterTest < Test::Unit::TestCase
5656
ex = assert_raise(Fluent::ConfigError) do
5757
create_driver(CONFIG + "raise_error yes")
5858
end
59-
expected_logs = [
60-
"#{@time} [warn]: fluent-plugin-tail-multiline is obsolete: Merged in in_tail in Fluentd v0.10.45. [fluent/fluentd#269](https://github.com/fluent/fluentd/issues/269)\n",
61-
"#{@time} [warn]: fluent-plugin-hostname is obsolete: Use [filter\\_record\\_transformer](http://docs.fluentd.org/v0.12/articles/filter_record_transformer) instead.\n"
62-
]
63-
assert_equal(expected_logs, $log.logs)
6459
assert_equal("Detected obsolete plugins", ex.message)
6560
end
6661

0 commit comments

Comments
 (0)