Skip to content

Commit 1c06292

Browse files
nakkaanakkaa
authored
Merge pull request #1997 from dev-hato/develop
リリース
2 parents 2c0d6c8 + 8c0258c commit 1c06292

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+5213
-3991
lines changed

‎.dockle-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.4.9
1+
0.4.11

‎.env.example‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
DATABASE_URL=postgres://postgres:password@postgres:5432/
2+
DISCORD_API_TOKEN=
3+
MISSKEY_API_TOKEN=
4+
MISSKEY_DOMAIN=
5+
MODE=
6+
OPENAI_API_KEY=
27
SLACK_API_TOKEN=
38
SLACK_SIGNING_SECRET=
49
YAHOO_API_TOKEN=

‎.github/workflows/add-to-task-list.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ on:
1010
jobs:
1111
add-to-task-list:
1212
runs-on: ubuntu-latest
13+
if: github.repository == github.event.pull_request.head.repo.full_name
1314
steps:
14-
- uses: dev-hato/actions-add-to-projects@v0.0.16
15+
- uses: dev-hato/actions-add-to-projects@v0.0.26
1516
with:
1617
github_app_id: ${{ secrets.PROJECT_AUTOMATION_APP_ID }}
1718
github_app_private_key: ${{ secrets.PROJECT_AUTOMATION_PRIVATE_KEY }}

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@v3.1.0
24+
uses: actions/checkout@v3.3.0
2525
with:
2626
# We must fetch at least the immediate parents so that if this is
2727
# a pull request then we can checkout the head.

‎.github/workflows/deploy-hato-bot.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
packages: write
2929
if: github.event_name == 'release' || (github.event_name == 'pull_request' && github.event.action != 'closed' && github.repository == github.event.pull_request.head.repo.full_name)
3030
steps:
31-
- uses: actions/checkout@v3.1.0
31+
- uses: actions/checkout@v3.3.0
3232
with:
3333
fetch-depth: 0
3434
- name: Set .env
@@ -43,7 +43,7 @@ jobs:
4343
uses: docker/setup-qemu-action@v2.1.0
4444
- name: Set up Docker Buildx
4545
id: buildx
46-
uses: docker/setup-buildx-action@v2.2.1
46+
uses: docker/setup-buildx-action@v2.4.1
4747
- run: echo "TAG_NAME=${HEAD_REF//\//-}" >> "$GITHUB_ENV"
4848
env:
4949
HEAD_REF: ${{github.head_ref}}
@@ -100,7 +100,7 @@ jobs:
100100
- name: Start docker
101101
env:
102102
DOCKER_CONTENT_TRUST: 1
103-
run: bash "${GITHUB_WORKSPACE}/scripts/deploy_hato_bot/deploy_docker_image/test.sh"
103+
run: docker compose up -d --wait
104104

105105
# .python-version をDockerイメージと同期させる
106106
update-version-python-version:
@@ -114,7 +114,7 @@ jobs:
114114
needs: deploy_docker_image
115115
if: always() && (needs.deploy_docker_image.result == 'success' || (github.event_name == 'pull_request' && github.event.action == 'closed'))
116116
steps:
117-
- uses: actions/checkout@v3.1.0
117+
- uses: actions/checkout@v3.3.0
118118
with:
119119
fetch-depth: 0
120120
ref: ${{ github.event.pull_request.head.sha }}
@@ -123,7 +123,7 @@ jobs:
123123
run: bash "${GITHUB_WORKSPACE}/scripts/deploy_hato_bot/update_version_python_version/get_python_version.sh"
124124
env:
125125
HEAD_REF: ${{github.head_ref || github.event.release.tag_name}}
126-
- uses: dev-hato/actions-diff-pr-management@v1.1.1
126+
- uses: dev-hato/actions-diff-pr-management@v1.1.3
127127
with:
128128
github-token: ${{secrets.GITHUB_TOKEN}}
129129
branch-name-prefix: fix-version-python-version
@@ -132,14 +132,13 @@ jobs:
132132
update-dockle:
133133
runs-on: ubuntu-latest
134134
steps:
135-
- uses: actions/checkout@v3.1.0
135+
- uses: actions/checkout@v3.3.0
136136
with:
137137
fetch-depth: 0
138138
ref: ${{ github.event.pull_request.head.sha }}
139-
- uses: dev-hato/actions-update-dockle@v0.0.33
139+
- uses: dev-hato/actions-update-dockle@v0.0.43
140140
with:
141141
github-token: ${{secrets.GITHUB_TOKEN}}
142-
repo-name: dev-hato/hato-bot
143142

144143
dockle:
145144
runs-on: ubuntu-latest
@@ -150,7 +149,7 @@ jobs:
150149
DOCKER_CONTENT_TRUST: 1
151150
REPOSITORY: ${{github.repository}}
152151
steps:
153-
- uses: actions/checkout@v3.1.0
152+
- uses: actions/checkout@v3.3.0
154153
- run: bash "${GITHUB_WORKSPACE}/scripts/deploy_hato_bot/dockle/run_dockle.sh"
155154
env:
156155
HEAD_REF: ${{github.head_ref || github.event.release.tag_name}}

‎.github/workflows/format-json-yml.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@ jobs:
1818
format-json-yml:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v3.1.0
21+
- uses: actions/checkout@v3.3.0
2222
with:
2323
fetch-depth: 0
2424
ref: ${{ github.event.pull_request.head.sha }}
25-
- uses: dev-hato/actions-format-json-yml@v0.0.27
25+
- uses: dev-hato/actions-format-json-yml@v0.0.34
2626
with:
2727
github-token: ${{secrets.GITHUB_TOKEN}}
28-
repo-name: dev-hato/hato-bot
2928
concurrency:
3029
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
3130
cancel-in-progress: true

‎.github/workflows/github-actions-cache-cleaner.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: github-actions-cache-cleaner
3+
4+
on:
5+
push:
6+
branches:
7+
- develop
8+
- master
9+
schedule:
10+
- cron: '0 21 * * *' # 06:00 JST
11+
workflow_dispatch:
12+
13+
jobs:
14+
github-actions-cache-cleaner:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v3.3.0
18+
- uses: dev-hato/github-actions-cache-cleaner@v0.0.9
19+
with:
20+
github-token: ${{secrets.GITHUB_TOKEN}}
21+
22+
concurrency:
23+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
24+
cancel-in-progress: true

‎.github/workflows/pr-check-npm.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ jobs:
2121
contents: write
2222
pull-requests: write
2323
steps:
24-
- uses: actions/checkout@v3.1.0
24+
- uses: actions/checkout@v3.3.0
2525
with:
2626
fetch-depth: 0
2727
ref: ${{ github.event.pull_request.head.sha }}
28-
- uses: actions/setup-node@v3.5.1
28+
- uses: actions/setup-node@v3.6.0
2929
with:
3030
cache: npm
3131
- name: Get Dependabot npm version
3232
id: get_dependabot_npm_version
3333
run: bash "${GITHUB_WORKSPACE}/scripts/pr_check_npm/pr_update_version/get_dependabot_npm_version.sh"
34-
- uses: dev-hato/actions-diff-pr-management@v1.1.1
34+
- uses: dev-hato/actions-diff-pr-management@v1.1.3
3535
with:
3636
github-token: ${{secrets.GITHUB_TOKEN}}
3737
branch-name-prefix: fix-version
@@ -41,19 +41,19 @@ jobs:
4141
runs-on: ubuntu-latest
4242
needs: pr-update-version
4343
steps:
44-
- uses: actions/checkout@v3.1.0
44+
- uses: actions/checkout@v3.3.0
4545
with:
4646
# ここでsubmodule持ってくるとdetached headにcommitして死ぬ
4747
# submodule: 'recursive'
4848
fetch-depth: 0
4949
ref: ${{ github.event.pull_request.head.sha }}
5050
- name: Set up Node.js
51-
uses: actions/setup-node@v3.5.1
51+
uses: actions/setup-node@v3.6.0
5252
with:
5353
cache: npm
5454
- name: Install dependencies
5555
run: bash "${GITHUB_WORKSPACE}/scripts/pr_check_npm/npm_install.sh"
56-
- uses: dev-hato/actions-diff-pr-management@v1.1.1
56+
- uses: dev-hato/actions-diff-pr-management@v1.1.3
5757
with:
5858
github-token: ${{secrets.GITHUB_TOKEN}}
5959
branch-name-prefix: npm

‎.github/workflows/pr-copy-ci-hato-bot.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,27 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v3.1.0
15+
- uses: actions/checkout@v3.3.0
1616
with:
1717
fetch-depth: 0
1818
path: hato-bot
1919
- name: Set org name
20-
uses: actions/github-script@v6.3.3
20+
uses: actions/github-script@v6.4.0
2121
id: set_org_name
2222
with:
2323
github-token: ${{secrets.GITHUB_TOKEN}}
2424
result-encoding: string
2525
script:
2626
return process.env.GITHUB_REPOSITORY.split('/')[0]
27-
- uses: actions/checkout@v3.1.0
27+
- uses: actions/checkout@v3.3.0
2828
with:
2929
fetch-depth: 0
3030
repository: ${{steps.set_org_name.outputs.result}}/sudden-death
3131
path: sudden-death
3232
- name: Copy CI
3333
run: bash "${GITHUB_WORKSPACE}/hato-bot/scripts/pr_copy_ci_hato_bot/pr_copy_ci/copy_ci.sh"
3434
- name: Copy package.json
35-
uses: actions/github-script@v6.3.3
35+
uses: actions/github-script@v6.4.0
3636
with:
3737
github-token: ${{secrets.GITHUB_TOKEN}}
3838
script: |

‎.github/workflows/pr-format.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
pr-format:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v3.1.0
22+
- uses: actions/checkout@v3.3.0
2323
with:
2424
# ここでsubmodule持ってくるとdetached headにcommitして死ぬ
2525
# submodule: 'recursive'
2626
fetch-depth: 0
2727
ref: ${{ github.event.pull_request.head.sha }}
2828
- run: bash "${GITHUB_WORKSPACE}/scripts/pr_format/pr_format/get_version.sh"
2929
- name: Set up Python ${{ env.PYTHON_VERSION }}
30-
uses: actions/setup-python@v4.3.0
30+
uses: actions/setup-python@v4.5.0
3131
with:
3232
python-version: ${{env.PYTHON_VERSION }}
3333
cache: pipenv
@@ -43,7 +43,7 @@ jobs:
4343
id: format
4444
run: bash "${GITHUB_WORKSPACE}/scripts/pr_format/pr_format/format.sh"
4545
continue-on-error: true
46-
- uses: dev-hato/actions-diff-pr-management@v1.1.1
46+
- uses: dev-hato/actions-diff-pr-management@v1.1.3
4747
with:
4848
github-token: ${{secrets.GITHUB_TOKEN}}
4949
branch-name-prefix: fix-format

0 commit comments

Comments
 (0)