Skip to content

Commit 3e10827

Browse files
authored
Merge branch 'develop' into massongit-patch-1
2 parents 302e62d + 7c43bd2 commit 3e10827

7 files changed

Lines changed: 50 additions & 50 deletions

File tree

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,23 @@ jobs:
4949
- run: echo 'TAG_NAME=${{ github.event.release.tag_name }}' >> "$GITHUB_ENV"
5050
if: ${{ github.event_name == 'release' }}
5151
- name: Build and push (build)
52-
uses: docker/bake-action@5ca506d06f70338a4968df87fd8bfee5cbfb84c7 # v6.0.0
52+
uses: docker/bake-action@60f5d53310314dbf8c33f0c8a01042536f2f6c36 # v6.2.0
5353
env:
5454
DOCKER_CONTENT_TRUST: 1
5555
with:
5656
push: true
5757
files: build.docker-compose.yml
5858
source: .
5959
- name: Build and push (main)
60-
uses: docker/bake-action@5ca506d06f70338a4968df87fd8bfee5cbfb84c7 # v6.0.0
60+
uses: docker/bake-action@60f5d53310314dbf8c33f0c8a01042536f2f6c36 # v6.2.0
6161
env:
6262
DOCKER_CONTENT_TRUST: 1
6363
with:
6464
push: true
6565
files: docker-compose.yml
6666
source: .
6767
- name: Build and push (dev)
68-
uses: docker/bake-action@5ca506d06f70338a4968df87fd8bfee5cbfb84c7 # v6.0.0
68+
uses: docker/bake-action@60f5d53310314dbf8c33f0c8a01042536f2f6c36 # v6.2.0
6969
env:
7070
DOCKER_CONTENT_TRUST: 1
7171
with:
@@ -75,7 +75,7 @@ jobs:
7575
- run: echo 'TAG_NAME=latest' >> "$GITHUB_ENV"
7676
if: ${{ github.event_name == 'release' }}
7777
- name: Build and push (build) (latest)
78-
uses: docker/bake-action@5ca506d06f70338a4968df87fd8bfee5cbfb84c7 # v6.0.0
78+
uses: docker/bake-action@60f5d53310314dbf8c33f0c8a01042536f2f6c36 # v6.2.0
7979
if: ${{ github.event_name == 'release' }}
8080
env:
8181
DOCKER_CONTENT_TRUST: 1
@@ -84,7 +84,7 @@ jobs:
8484
files: build.docker-compose.yml
8585
source: .
8686
- name: Build and push (main) (latest)
87-
uses: docker/bake-action@5ca506d06f70338a4968df87fd8bfee5cbfb84c7 # v6.0.0
87+
uses: docker/bake-action@60f5d53310314dbf8c33f0c8a01042536f2f6c36 # v6.2.0
8888
if: ${{ github.event_name == 'release' }}
8989
env:
9090
DOCKER_CONTENT_TRUST: 1
@@ -93,7 +93,7 @@ jobs:
9393
files: docker-compose.yml
9494
source: .
9595
- name: Build and push (dev) (latest)
96-
uses: docker/bake-action@5ca506d06f70338a4968df87fd8bfee5cbfb84c7 # v6.0.0
96+
uses: docker/bake-action@60f5d53310314dbf8c33f0c8a01042536f2f6c36 # v6.2.0
9797
if: ${{ github.event_name == 'release' }}
9898
env:
9999
DOCKER_CONTENT_TRUST: 1

.github/workflows/pr-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
submodules: "recursive"
5959
fetch-depth: 0
6060
- name: Lint dotenv
61-
uses: dotenv-linter/action-dotenv-linter@9c9a09ba60235ae0b92b2e2ed8f4268ac76d075f # v2.23.0
61+
uses: dotenv-linter/action-dotenv-linter@382525b7d91e7b71b52e064b8f1fa5908c4650d2 # v2.24.0
6262
concurrency:
6363
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
6464
cancel-in-progress: true

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.13.1-slim@sha256:1127090f9fff0b8e7c3a1367855ef8a3299472d2c9ed122948a576c39addeaf1 AS base
1+
FROM python:3.13.1-slim@sha256:23a81be7b258c8f516f7a60e80943cace4350deb8204cf107c7993e343610d47 AS base
22

33
# バージョン情報に表示する commit hash を埋め込む
44
FROM base AS commit-hash

postgres/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:15.10-bullseye@sha256:64c75e82b01c09a8fce09cf03f52f2c7c20f7b7530ab1fa51c678fff826af6f0
1+
FROM postgres:15.10-bullseye@sha256:860206224dcd5c3d7e56a5b619ba6176dc89700de9395c4ad4b5c2c8dd483fc4
22

33
RUN find / -type f -perm /u+s -ignore_readdir_race -exec chmod u-s {} \; && \
44
find / -type f -perm /g+s -ignore_readdir_race -exec chmod g-s {} \;

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name = "hato-bot"
33
version = "3.0.5"
44
description = "愛嬌のあるBot"
55
requires-python = "==3.13.1"
6-
dependencies = [ "python-dotenv==1.0.1", "requests==2.32.3", "Pillow>=7.1.2", "opencv-python==4.10.0.84", "slack-bolt==1.22.0", "slack-sdk==3.34.0", "gitpython==3.1.44", "pandas==2.2.3", "matplotlib==3.10.0", "openai==1.59.6", "discord.py==2.4.0", "misskey.py==4.1.0", "websockets==14.1", "flask==3.1.0", "markupsafe==3.0.2", "numpy==2.2.1", "emoji==2.14.0", "puremagic==1.28", "audioop-lts==0.2.1", "psycopg[binary,pool]==3.2.3", "sudden-death==0.0.1",]
6+
dependencies = [ "python-dotenv==1.0.1", "requests==2.32.3", "Pillow>=7.1.2", "opencv-python==4.10.0.84", "slack-bolt==1.22.0", "slack-sdk==3.34.0", "gitpython==3.1.44", "pandas==2.2.3", "matplotlib==3.10.0", "openai==1.59.8", "discord.py==2.4.0", "misskey.py==4.1.0", "websockets==14.1", "flask==3.1.0", "markupsafe==3.0.2", "numpy==2.2.2", "emoji==2.14.1", "puremagic==1.28", "audioop-lts==0.2.1", "psycopg[binary,pool]==3.2.3", "sudden-death==0.0.1",]
77

88
[dependency-groups]
9-
dev = [ "autopep8==2.3.1", "requests-mock==1.12.1", "pylint==3.3.3", "sqlfluff==3.3.0", "mypy==1.14.1", "flake8==7.1.1", "isort==5.13.2", "pre-commit==4.0.1", "importlib-metadata==8.5.0", "toml==0.10.2", "types-toml==0.10.8.20240310", "pyink==24.10.0",]
9+
dev = [ "autopep8==2.3.2", "requests-mock==1.12.1", "pylint==3.3.3", "sqlfluff==3.3.0", "mypy==1.14.1", "flake8==7.1.1", "isort==5.13.2", "pre-commit==4.0.1", "importlib-metadata==8.5.0", "toml==0.10.2", "types-toml==0.10.8.20240310", "pyink==24.10.0",]
1010

1111
[tool.uv]
1212
[[tool.uv.index]]

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uv==0.5.18
1+
uv==0.5.21

0 commit comments

Comments
 (0)