Skip to content

Commit

Permalink
Merge branch 'master' into async-2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kenhys authored Apr 4, 2024
2 parents 1c411ab + 1a2759c commit 79560bd
Show file tree
Hide file tree
Showing 110 changed files with 3,444 additions and 1,309 deletions.
50 changes: 50 additions & 0 deletions .github/DISCUSSION_TEMPLATE/q-a-japanese.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
title: "[QA (Japanese)]"
labels: ["Q&A (Japanese)"]
body:
- type: markdown
attributes:
value: |
日本語で気軽に質問するためのカテゴリです。もし他の人が困っているのを見つけたらぜひ回答してあげてください。
- type: textarea
id: question
attributes:
label: やりたいこと
description: |
何について困っているのかを書いてください。試したことや実際の結果を示してください。
期待する挙動と実際の結果の違いがあればそれも書くのをおすすめします。
render: markdown
validations:
required: true
- type: textarea
id: configuration
attributes:
label: 設定した内容
description: |
どのような設定をして期待する挙動を実現しようとしたのかを書いてください。(例: fluentd.confの内容を貼り付ける)
render: apache
- type: textarea
id: logs
attributes:
label: ログの内容
description: |
Fluentdのログを提示してください。エラーログがあると回答の助けになります。(例: fluentd.logの内容を貼り付ける)
render: shell
- type: textarea
id: environment
attributes:
label: 環境について
description: |
- Fluentd or td-agent version: `fluentd --version` or `td-agent --version`
- Operating system: `cat /etc/os-release`
- Kernel version: `uname -r`
どんな環境で困っているかの情報がないと、再現できないため誰も回答できないことがあります。
必要な情報を記入することをおすすめします。
value: |
- Fluentd version:
- TD Agent version:
- Fluent Package version:
- Docker image (tag):
- Operating system:
- Kernel version:
render: markdown
47 changes: 47 additions & 0 deletions .github/DISCUSSION_TEMPLATE/q-a.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
title: "[Q&A]"
labels: ["Q&A"]
body:
- type: markdown
attributes:
value: |
It is recommended to support each other.
- type: textarea
id: question
attributes:
label: What is a problem?
description: |
A clear and concise description of what you want to happen.
What exactly did you do (or not do) that was effective (or ineffective)?
render: markdown
validations:
required: true
- type: textarea
id: configuration
attributes:
label: Describe the configuration of Fluentd
description: |
If there is the actual configuration of Fluentd, it will help.
- type: textarea
id: logs
attributes:
label: Describe the logs of Fluentd
description: |
If there are error logs of Fluentd, it will help.
- type: textarea
id: environment
attributes:
label: Environment
description: |
- Fluentd or td-agent version: `fluentd --version` or `td-agent --version`
- Operating system: `cat /etc/os-release`
- Kernel version: `uname -r`
Please describe your environment information. If will help to support.
value: |
- Fluentd version:
- TD Agent version:
- Fluent Package version:
- Docker image (tag):
- Operating system:
- Kernel version:
render: markdown
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: Bug Report
description: Create a report with a procedure for reproducing the bug
labels: "waiting-for-triage"
body:
- type: markdown
attributes:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: Feature request
description: Suggest an idea for this project
labels: "waiting-for-triage"
body:
- type: markdown
attributes:
Expand Down
34 changes: 0 additions & 34 deletions .github/workflows/macos-test.yaml

This file was deleted.

24 changes: 24 additions & 0 deletions .github/workflows/stale-actions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: "Mark or close stale issues and PRs"
on:
schedule:
- cron: "00 10 * * *"

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 30
days-before-close: 7
stale-issue-message: "This issue has been automatically marked as stale because it has been open 30 days with no activity. Remove stale label or comment or this issue will be closed in 7 days"
stale-pr-message: "This PR has been automatically marked as stale because it has been open 30 days with no activity. Remove stale label or comment or this PR will be closed in 7 days"
close-issue-message: "This issue was automatically closed because of stale in 7 days"
close-pr-message: "This PR was automatically closed because of stale in 7 days"
stale-pr-label: "stale"
stale-issue-label: "stale"
exempt-issue-labels: "waiting-for-triage,bug,enhancement,feature request,pending,work_in_progress,v1,v2"
exempt-pr-labels: "waiting-for-triage,bug,enhancement,feature request,pending,work_in_progress,v1,v2"
exempt-all-assignees: true
exempt-all-milestones: true
31 changes: 31 additions & 0 deletions .github/workflows/test-ruby-head.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Test with Ruby head

on:
schedule:
- cron: '11 14 * * 0'
workflow_dispatch:

jobs:
test:
runs-on: ${{ matrix.os }}
continue-on-error: true
strategy:
fail-fast: false
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
ruby-version: ['head']

name: Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby-version }}
- name: Install addons
if: ${{ matrix.os == 'ubuntu-latest' }}
run: sudo apt-get install libgmp3-dev libcap-ng-dev
- name: Install dependencies
run: bundle install
- name: Run tests
run: bundle exec rake test TESTOPTS="-v --no-show-detail-immediately"
18 changes: 7 additions & 11 deletions .github/workflows/linux-test.yaml → .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Testing on Ubuntu
name: Test

on:
push:
Expand All @@ -9,28 +9,24 @@ on:
jobs:
test:
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental }}
continue-on-error: false
strategy:
fail-fast: false
matrix:
ruby-version: ['3.2', '3.1', '3.0', '2.7']
os: [ubuntu-latest]
experimental: [false]
include:
- ruby-version: head
os: ubuntu-latest
experimental: true
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
ruby-version: ['3.3', '3.2', '3.1', '3.0', '2.7']

name: Unit testing with Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
name: Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby-version }}
- name: Install addons
if: ${{ matrix.os == 'ubuntu-latest' }}
run: sudo apt-get install libgmp3-dev libcap-ng-dev
- name: Install dependencies
run: bundle install
- name: Run tests
run: bundle exec rake test
run: bundle exec rake test TESTOPTS="-v --no-show-detail-immediately"
49 changes: 0 additions & 49 deletions .github/workflows/windows-test.yaml

This file was deleted.

Loading

0 comments on commit 79560bd

Please sign in to comment.