Skip to content

Commit c054ec3

Browse files
authored
Merge pull request #790 from dev-hato/develop
リリース
2 parents cda79ea + d39c707 commit c054ec3

4 files changed

Lines changed: 17 additions & 7 deletions

File tree

.github/workflows/pr-docker-hato-bot.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
name: deploy
33

44
on:
5-
push:
6-
branches:
7-
- master
5+
release:
6+
types:
7+
- published
88
pull_request:
99

1010
jobs:
@@ -38,8 +38,10 @@ jobs:
3838
env:
3939
HEAD_REF: ${{github.head_ref}}
4040
if: ${{ github.event_name == 'pull_request' }}
41-
- run: echo 'TAG_NAME=latest' >> "$GITHUB_ENV"
42-
if: ${{ github.event_name == 'push' }}
41+
- run: |
42+
echo 'TAG_NAME=v${{ github.event.release.tag_name }}' >> "$GITHUB_ENV"
43+
echo 'TAG_NAME=latest' >> "$GITHUB_ENV"
44+
if: ${{ github.event_name == 'relase' }}
4345
- name: Build docker image
4446
run: docker-compose build --build-arg BUILDKIT_INLINE_CACHE=1
4547
- name: Start docker

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@
77
* `Removed` 削除された機能について。
88
* `Fixed` バグ修正について。
99

10-
## v2.2.0 - 2022-02-11
10+
## v2.2.1 - 2022-02-11
11+
12+
### Fixed
13+
14+
* docker compose時に `TAG_NAME` を指定する記述を追加しました。(#788)
15+
16+
## v2.2.0 - 2022-02-10
1117

1218
### Added
1319

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565

6666
```sh
6767
cd ./setup
68+
TAG_NAME=$(git symbolic-ref --short HEAD | sed -e "s:/:-:g")
6869
docker-compose up -d
6970
cd ..
7071
```
@@ -73,6 +74,7 @@
7374

7475
```sh
7576
cd ./setup
77+
TAG_NAME=$(git symbolic-ref --short HEAD | sed -e "s:/:-:g")
7678
docker-compose restart
7779
```
7880

plugins/hato.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from library.clientclass import BaseClient
2424
from library.jma_amesh import jma_amesh
2525
logger = getLogger(__name__)
26-
VERSION = "2.2.0"
26+
VERSION = "2.2.1"
2727

2828

2929
def split_command(command: str, maxsplit: int = 0) -> List[str]:

0 commit comments

Comments
 (0)