From 3ca356e364ce4b63d404e40650ae787cc2892a45 Mon Sep 17 00:00:00 2001
From: felinae98 <731499577@qq.com>
Date: Tue, 7 Jun 2022 01:52:06 +0800
Subject: [PATCH] fix ci
---
.github/workflows/main.yml | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3bd2b81..7d6d4a1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -80,6 +80,7 @@ jobs:
uses: codecov/codecov-action@v3
with:
env_vars: OS,PYTHON_VERSION
+
docker-main:
name: Docker main
runs-on: ubuntu-latest
@@ -117,6 +118,10 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
+ - name: Git Branch Name
+ id: git-branch-name
+ uses: EthanSK/git-branch-name-action@v1
+
- name: Build and push
uses: docker/build-push-action@v2
if: github.event_name != 'pull_request'
@@ -124,7 +129,7 @@ jobs:
context: .
file: ./docker/Dockerfile_with_frontend
push: true
- tags: felinae98/nonebot-bison:${GITHUB_REF##*/}
+ tags: felinae98/nonebot-bison:${{ env.GIT_BRANCH_NAME }}
cache-from: type=gha
cache-to: type=gha,mode=max
@@ -148,6 +153,10 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
+ - name: Git Branch Name
+ id: git-branch-name
+ uses: EthanSK/git-branch-name-action@v1
+
- name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
@@ -161,6 +170,6 @@ jobs:
context: .
file: ./docker/Dockerfile_with_frontend_sentry
push: ${{ github.event_name != 'pull_request' }}
- tags: felinae98/nonebot-bison:${GITHUB_REF##*/}-sentry
+ tags: felinae98/nonebot-bison:${{ env.GIT_BRANCH_NAME }}-sentry
cache-from: type=gha
cache-to: type=gha,mode=max