From c52f6802b21fb7989489b6e6375eb2a88066b402 Mon Sep 17 00:00:00 2001 From: FrankLeeeee Date: Wed, 11 Jan 2023 17:16:16 +0800 Subject: [PATCH] [workflow] fixed the on-merge condition check --- .github/workflows/draft_github_release_post.yml | 3 +-- .github/workflows/release_docker.yml | 9 ++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/draft_github_release_post.yml b/.github/workflows/draft_github_release_post.yml index 413714dafa86..53bfa9e8deb6 100644 --- a/.github/workflows/draft_github_release_post.yml +++ b/.github/workflows/draft_github_release_post.yml @@ -8,11 +8,10 @@ on: types: - closed - jobs: release: name: Draft Release Post - if: github.repository == 'hpcaitech/ColossalAI' + if: ( github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true ) && github.repository == 'hpcaitech/ColossalAI' runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/release_docker.yml b/.github/workflows/release_docker.yml index c72d3fb33edd..8da6e5f87606 100644 --- a/.github/workflows/release_docker.yml +++ b/.github/workflows/release_docker.yml @@ -2,13 +2,16 @@ name: Publish Docker Image to DockerHub on: workflow_dispatch: - release: - types: [published] + pull_request: + paths: + - 'version.txt' + types: + - closed jobs: release: name: Publish Docker Image to DockerHub - if: github.repository == 'hpcaitech/ColossalAI' + if: ( github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true ) && github.repository == 'hpcaitech/ColossalAI' runs-on: [self-hosted, gpu] container: image: "hpcaitech/docker-in-docker:latest"