From 74ed640305ed9abd0eebef60fe7765b65fcf3156 Mon Sep 17 00:00:00 2001 From: FrankLeeeee Date: Mon, 22 May 2023 15:28:06 +0800 Subject: [PATCH 1/2] [workflow] fixed the docker build workflow --- .github/workflows/release_docker_after_merge.yml | 13 +++++-------- .github/workflows/report_test_coverage.yml | 6 +++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release_docker_after_merge.yml b/.github/workflows/release_docker_after_merge.yml index 6b6684641117..0c70be0d875c 100644 --- a/.github/workflows/release_docker_after_merge.yml +++ b/.github/workflows/release_docker_after_merge.yml @@ -1,12 +1,9 @@ -name: Publish Docker Image to DockerHub after Merge +name: Publish Docker Image to DockerHub after Release on: workflow_dispatch: - pull_request: - paths: - - 'version.txt' - types: - - closed + release: + types: [published] jobs: release: @@ -26,7 +23,7 @@ jobs: run: | version=$(cat version.txt) tag=hpcaitech/colossalai:$version - docker build --build-arg http_proxy=http://172.17.0.1:7890 --build-arg https_proxy=http://172.17.0.1:7890 --build-arg VERSION=v${version} -t $tag ./docker + docker build --build-arg http_proxy=http://172.17.0.1:7890 --build-arg https_proxy=http://172.17.0.1:7890 --build-arg VERSION=v${version} -t $tag ./docker echo "tag=${tag}" >> $GITHUB_OUTPUT - name: Log in to Docker Hub @@ -50,7 +47,7 @@ jobs: - uses: actions/setup-python@v2 with: - python-version: '3.8.14' + python-version: "3.8.14" - name: Install requests run: pip install requests diff --git a/.github/workflows/report_test_coverage.yml b/.github/workflows/report_test_coverage.yml index bbada74e6850..d9b131fd994c 100644 --- a/.github/workflows/report_test_coverage.yml +++ b/.github/workflows/report_test_coverage.yml @@ -10,7 +10,7 @@ jobs: report-test-coverage: runs-on: ubuntu-latest steps: - - name: 'Download artifact' + - name: "Download artifact" uses: actions/github-script@v6 with: script: | @@ -31,7 +31,7 @@ jobs: let fs = require('fs'); fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/report.zip`, Buffer.from(download.data)); - - name: 'Unzip artifact' + - name: "Unzip artifact" id: unzip run: | unzip report.zip @@ -58,7 +58,7 @@ jobs: echo "" >> coverage_report.txt mv coverage_report.txt coverage.txt - - name: 'Comment on PR' + - name: "Comment on PR" if: steps.unzip.outputs.hasReport == 'true' uses: actions/github-script@v6 with: From dfffe8e9ef0c89729f07134936b4955cfdf94292 Mon Sep 17 00:00:00 2001 From: FrankLeeeee Date: Mon, 22 May 2023 15:35:09 +0800 Subject: [PATCH 2/2] polish code --- ..._docker_after_merge.yml => release_docker_after_publish.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{release_docker_after_merge.yml => release_docker_after_publish.yml} (97%) diff --git a/.github/workflows/release_docker_after_merge.yml b/.github/workflows/release_docker_after_publish.yml similarity index 97% rename from .github/workflows/release_docker_after_merge.yml rename to .github/workflows/release_docker_after_publish.yml index 0c70be0d875c..7d83fa3715a8 100644 --- a/.github/workflows/release_docker_after_merge.yml +++ b/.github/workflows/release_docker_after_publish.yml @@ -1,4 +1,4 @@ -name: Publish Docker Image to DockerHub after Release +name: Publish Docker Image to DockerHub after Publish on: workflow_dispatch: