diff --git a/.cspell/custom-words.txt b/.cspell/custom-words.txt new file mode 100644 index 00000000..06f64a77 --- /dev/null +++ b/.cspell/custom-words.txt @@ -0,0 +1,26 @@ +adrienverge +antonbabenko +autobuild +Autobuild +autofix +automerge +buildscript +CODEOWNERS +codeql +datasource +Datasources +igorshubovych +kentaro +markdownlint +nodenv +ooyama +pyenv +renovatebot +reviewdog +rinchsan +shellcheck +SSIA +textlint +textlintcache +tqer +buildx diff --git a/.github/labeler.yml b/.github/labeler.yml index d547e57f..5e108b45 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,30 +1,30 @@ -"editorconfig": - - ".editorconfig" +editorconfig: + - .editorconfig -"document": +document: - "**/*.md" - "**/*.txt" - "**/*.rst" - - "LICENSE" + - LICENSE -"terraform": - - ".github/actions/terraform**/action.yml" - - ".github/workflows/terraform**.yml" +terraform: + - .github/actions/terraform**/action.yml + - .github/workflows/terraform**.yml -"textlint": +textlint: - "**/.textlint*" -"yamllint": +yamllint: - "**/.yamllint" -"markdownlint": +markdownlint: - "**/.markdownlint*.json" -"asdf": +asdf: - "**/.tool-versions" -"actionlint": - - ".github/workflows/actionlint.yml" +actionlint: + - .github/workflows/actionlint.yml -"CODEOWNERS": - - "CODEOWNERS" +CODEOWNERS: + - CODEOWNERS diff --git a/.github/workflows/auto-assign.yml b/.github/workflows/auto-assign.yml index 140942f1..3337dd0e 100644 --- a/.github/workflows/auto-assign.yml +++ b/.github/workflows/auto-assign.yml @@ -5,13 +5,17 @@ on: pull_request: types: [opened, ready_for_review] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: add-reviews: + runs-on: ubuntu-latest permissions: contents: read pull-requests: write - runs-on: ubuntu-latest - timeout-minutes: 2 + timeout-minutes: 5 steps: - name: Auto Assign uses: kentaro-m/auto-assign-action@v2.0.0 diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index d4e428c9..f8fe3041 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -4,14 +4,16 @@ name: Labeler on: pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: auto-labeling: - name: Auto-labeling runs-on: ubuntu-latest - timeout-minutes: 2 permissions: contents: read pull-requests: write + timeout-minutes: 5 steps: - - name: Labeler - uses: actions/labeler@v4 + - uses: actions/labeler@v4 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index d865c7d2..c729bda3 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -7,18 +7,19 @@ on: - main pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: pre-commit: - name: pre-commit runs-on: ubuntu-latest timeout-minutes: 10 steps: - - name: Checkout - uses: actions/checkout@v4.1.2 + - uses: actions/checkout@v4 with: ref: ${{ github.head_ref }} - - name: pre-commit - uses: pre-commit/action@v3.0.1 + - uses: pre-commit/action@v3.0.1 with: extra_args: -a --show-diff-on-failure diff --git a/README.md b/README.md index b96865cb..4c4517b8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,25 @@ # renovate-config -Renovate Configuration. +このリポジトリには、依存関係の更新ツールであるRenovateの設定ファイルが含まれています。Renovateは、プロジェクトの依存関係を最新のバージョンに保つプロセスを自動化するのに役立ちます。 + +## 参照する仕組み + +```mermaid +graph LR +A[リポジトリ] -- 参照 --> B[renovate.json] +B -- 参照 --> C[tqer39/renovate-config/default.json] +C -- 参照 --> C[tqer39/renovate-config/*.json] +``` + +## 動作方法 + +1. このリポジトリを自分のGitHubアカウントにフォークします。 +2. プロジェクトの要件に基づいて、必要な変更を設定ファイルに行います。 +3. Renovateを設定して、フォークしたリポジトリを設定のソースとして使用します。 +4. Renovateは定期的にプロジェクトの依存関係をスキャンし、このリポジトリの設定に基づいて最新バージョンに更新するためのプルリクエストを作成します。 + +## 貢献 + +設定ファイルに対する提案や改善点がある場合は、問題を開いたりプルリクエストを送信したりしてください。 + +更新を楽しんでください! diff --git a/autoMergeStrategy.json b/autoMergeStrategy.json new file mode 100644 index 00000000..e36e16d5 --- /dev/null +++ b/autoMergeStrategy.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "automergeStrategy": "squash" +} diff --git a/cspell.json b/cspell.json index cd75d03c..c5a353ad 100644 --- a/cspell.json +++ b/cspell.json @@ -1,4 +1,5 @@ { + "dictionaries": ["custom-words"], "files": [ "**", ".*/**" @@ -7,31 +8,11 @@ ".git", ".gitignore" ], - "words": [ - "adrienverge", - "antonbabenko", - "autobuild", - "Autobuild", - "autofix", - "automerge", - "buildscript", - "CODEOWNERS", - "codeql", - "datasource", - "Datasources", - "igorshubovych", - "kentaro", - "markdownlint", - "nodenv", - "ooyama", - "pyenv", - "renovatebot", - "reviewdog", - "rinchsan", - "shellcheck", - "SSIA", - "textlint", - "textlintcache", - "tqer" + "dictionaryDefinitions": [ + { + "name": "custom-words", + "path": "./.cspell/custom-words.txt", + "addWords": true + } ] } diff --git a/default.json b/default.json index eb1e21bd..9ce68f39 100644 --- a/default.json +++ b/default.json @@ -7,6 +7,7 @@ "github>tqer39/renovate-config:automergeNodeEnv", "github>tqer39/renovate-config:automergePreCommit", "github>tqer39/renovate-config:automergePyEnv", + "github>tqer39/renovate-config:automergeStrategy", "github>tqer39/renovate-config:automergeTerraform", "github>tqer39/renovate-config:dependencyDashboard", "github>tqer39/renovate-config:major",