summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-01-17 15:48:45 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-01-17 15:48:45 +0900
commit0db2abd56c6f7e4a0f6425595f0c39ea092fa8a4 (patch)
tree126fc0141bfc2b1b0611928eee2327ee8d3ada53 /.github
parent:art: (diff)
parentUpdate actions (#9638) (diff)
downloadsharkey-0db2abd56c6f7e4a0f6425595f0c39ea092fa8a4.tar.gz
sharkey-0db2abd56c6f7e4a0f6425595f0c39ea092fa8a4.tar.bz2
sharkey-0db2abd56c6f7e4a0f6425595f0c39ea092fa8a4.zip
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/docker-develop.yml6
-rw-r--r--.github/workflows/docker.yml6
2 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index f04888e982..d2cf4bf629 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -16,16 +16,16 @@ jobs:
uses: actions/checkout@v3.3.0
- name: Docker meta
id: meta
- uses: docker/metadata-action@v3
+ uses: docker/metadata-action@v4
with:
images: misskey/misskey
- name: Log in to Docker Hub
- uses: docker/login-action@v1
+ uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and Push to Docker Hub
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
with:
context: .
push: true
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 84d36f8465..d7803ce3ec 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@v3.3.0
- name: Docker meta
id: meta
- uses: docker/metadata-action@v3
+ uses: docker/metadata-action@v4
with:
images: misskey/misskey
tags: |
@@ -26,12 +26,12 @@ jobs:
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
- name: Log in to Docker Hub
- uses: docker/login-action@v1
+ uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and Push to Docker Hub
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
with:
context: .
push: true