Skip to content

Commit

Permalink
Merge pull request #2432 from dev-hato/develop
Browse files Browse the repository at this point in the history
リリース
  • Loading branch information
nakkaa authored Apr 6, 2023
2 parents 1c06292 + 076c970 commit 2bc8a11
Show file tree
Hide file tree
Showing 26 changed files with 7,089 additions and 6,727 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/add-to-task-list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
if: github.repository == github.event.pull_request.head.repo.full_name
steps:
- uses: dev-hato/[email protected].26
- uses: dev-hato/[email protected].31
with:
github_app_id: ${{ secrets.PROJECT_AUTOMATION_APP_ID }}
github_app_private_key: ${{ secrets.PROJECT_AUTOMATION_PRIVATE_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
steps:
- name: Checkout repository
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.0
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/deploy-hato-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
packages: write
if: github.event_name == 'release' || (github.event_name == 'pull_request' && github.event.action != 'closed' && github.repository == github.event.pull_request.head.repo.full_name)
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
with:
fetch-depth: 0
- name: Set .env
Expand All @@ -43,7 +43,7 @@ jobs:
uses: docker/[email protected]
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.4.1
uses: docker/setup-buildx-action@v2.5.0
- run: echo "TAG_NAME=${HEAD_REF//\//-}" >> "$GITHUB_ENV"
env:
HEAD_REF: ${{github.head_ref}}
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
needs: deploy_docker_image
if: always() && (needs.deploy_docker_image.result == 'success' || (github.event_name == 'pull_request' && github.event.action == 'closed'))
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand All @@ -132,11 +132,11 @@ jobs:
update-dockle:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
- uses: dev-hato/[email protected].43
- uses: dev-hato/[email protected].47
with:
github-token: ${{secrets.GITHUB_TOKEN}}

Expand All @@ -149,7 +149,7 @@ jobs:
DOCKER_CONTENT_TRUST: 1
REPOSITORY: ${{github.repository}}
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
- run: bash "${GITHUB_WORKSPACE}/scripts/deploy_hato_bot/dockle/run_dockle.sh"
env:
HEAD_REF: ${{github.head_ref || github.event.release.tag_name}}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/format-json-yml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
format-json-yml:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
- uses: dev-hato/[email protected].34
- uses: dev-hato/[email protected].36
with:
github-token: ${{secrets.GITHUB_TOKEN}}
concurrency:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/github-actions-cache-cleaner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
github-actions-cache-cleaner:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.3.0
- uses: dev-hato/[email protected].9
- uses: actions/checkout@v3.5.0
- uses: dev-hato/[email protected].13
with:
github-token: ${{secrets.GITHUB_TOKEN}}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-check-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
contents: write
pull-requests: write
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand All @@ -41,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
needs: pr-update-version
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
with:
# ここでsubmodule持ってくるとdetached headにcommitして死ぬ
# submodule: 'recursive'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-copy-ci-hato-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
with:
fetch-depth: 0
path: hato-bot
Expand All @@ -24,7 +24,7 @@ jobs:
result-encoding: string
script:
return process.env.GITHUB_REPOSITORY.split('/')[0]
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
with:
fetch-depth: 0
repository: ${{steps.set_org_name.outputs.result}}/sudden-death
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
pr-format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
with:
# ここでsubmodule持ってくるとdetached headにcommitして死ぬ
# submodule: 'recursive'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-merge-develop-hato-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
with:
fetch-depth: 0
- name: Set org name
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-release-hato-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
with:
fetch-depth: 0
- name: Get diff
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-renovate-config-validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
pr-renovate-config-validator:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
- name: Set up Node.js
uses: actions/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-test-hato-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
with:
submodules: "recursive"
- run: echo "PYTHON_VERSION=$(cat .python-version)" >> "${GITHUB_ENV}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
pr-super-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
with:
submodules: "recursive"
fetch-depth: 0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-update-gitleaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
pr-update-gitleaks:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand All @@ -26,7 +26,7 @@ jobs:
cache: npm
- name: Install packages
run: bash "${GITHUB_WORKSPACE}/scripts/npm_ci.sh"
- uses: dev-hato/[email protected].38
- uses: dev-hato/[email protected].40
with:
github-token: ${{secrets.GITHUB_TOKEN}}
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-readme-hato-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
update-readme:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.0
if: github.event_name != 'pull_request' || github.event.action != 'closed'
with:
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.11.2
3.11.3
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,19 @@
* `Removed` 削除された機能について。
* `Fixed` バグ修正について。

## v3.0.1 - 2023-04-06

### Fixed

* helpコマンドが動かない問題を修正しました。(#2429)

## v3.0.0 - 2023-03-09

### Added

* Discordに対応しました。(#2372)
* Misskeyに対応しました。(#2386)
* ChartGPTで文章を作成する機能を追加しました。(#2364)
* ChatGPTで文章を作成する機能を追加しました。(#2364)
* openAIのImage generationで画像生成する機能を追加しました。(#2383)

## v2.4.4 - 2022-11-30
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends git \
&& sed -i "s/^\(GIT_COMMIT_HASH = \).*\$/\1'$(git rev-parse HEAD)'/" slackbot_settings.py

FROM python:3.11.2-slim-bullseye
FROM python:3.11.3-slim-bullseye

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

Expand All @@ -27,7 +27,7 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends git gcc libc6-dev libopencv-dev libgl1-mesa-dev libglib2.0-0 curl && \
curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
apt-get install -y --no-install-recommends nodejs && \
pip install pipenv==2023.2.18 --no-cache-dir && \
pip install pipenv==2023.3.20 --no-cache-dir && \
if [ "${ENV}" = 'dev' ]; then \
pipenv install --system --skip-lock --dev; \
else \
Expand All @@ -50,6 +50,7 @@ COPY library library
COPY plugins plugins
COPY postgres/docker-entrypoint-initdb.d postgres/docker-entrypoint-initdb.d
COPY .textlintrc .textlintrc
COPY commands.txt commands.txt
COPY --from=commit-hash slackbot_settings.py slackbot_settings.py

ENV GIT_PYTHON_REFRESH=quiet
Expand Down
12 changes: 6 additions & 6 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ python_version = "3.11"
[dev-packages]
autopep8 = "==2.0.2"
requests-mock = "==1.10.0"
pylint = "==2.17.0"
sqlfluff = "==1.4.5"
pylint = "==2.17.2"
sqlfluff = "==2.0.3"
mypy = "==1.1.1"
flake8 = "==6.0.0"
black = "*"
Expand All @@ -25,13 +25,13 @@ opencv-python = "==4.7.0.72"
pyperclip = "==1.8.2"
click = "==8.1.3"
sudden-death = {git = "https://github.com/dev-hato/sudden-death", ref = "master"}
psycopg2-binary = "==2.9.5"
psycopg2-binary = "==2.9.6"
slackeventsapi = "==3.0.1"
slackclient = "==2.9.4"
gitpython = "==3.1.31"
pandas = "==1.5.3"
pandas = "==2.0.0"
matplotlib = "==3.7.1"
openai = "==0.27.1"
openai = "==0.27.4"
discord = "==2.2.2"
"misskey.py" = "==4.1.0"
websockets = "==10.4"
websockets = "==11.0.1"
Loading

0 comments on commit 2bc8a11

Please sign in to comment.