diff --git a/.github/workflows/release_docker_after_merge.yml b/.github/workflows/release_docker_after_merge.yml index dbb38208e..607c19b05 100644 --- a/.github/workflows/release_docker_after_merge.yml +++ b/.github/workflows/release_docker_after_merge.yml @@ -59,8 +59,7 @@ jobs: id: message-preparation run: | url=$SERVER_URL/$REPO/actions/runs/$RUN_ID - - if [ $STATUS == 'success' ] + if [ "$STATUS" == 'success' ] then msg="The Docker image for the latest release has been successfully built and pushed to DockerHub." else @@ -73,4 +72,4 @@ jobs: REPO: ${{ github.repository }} RUN_ID: ${{ github.run_id }} WEBHOOK_URL: ${{ secrets.LARK_NOTIFICATION_WEBHOOK_URL }} - STATUS: ${{ steps.docker-push.outcome }} + STATUS: ${{ needs.release.result }} diff --git a/.github/workflows/release_pypi_after_merge.yml b/.github/workflows/release_pypi_after_merge.yml index 7fa4bdd03..b987b4397 100644 --- a/.github/workflows/release_pypi_after_merge.yml +++ b/.github/workflows/release_pypi_after_merge.yml @@ -34,7 +34,7 @@ jobs: notify: name: Notify Lark via webhook - needs: release + needs: build-n-publish runs-on: ubuntu-latest if: ${{ always() }} steps: @@ -52,7 +52,7 @@ jobs: run: | url=$SERVER_URL/$REPO/actions/runs/$RUN_ID - if [ $STATUS == 'success' ] + if [ "$STATUS" == 'success' ] then msg="The Colossal-AI latest version has been successfully released to PyPI." else @@ -65,4 +65,4 @@ jobs: REPO: ${{ github.repository }} RUN_ID: ${{ github.run_id }} WEBHOOK_URL: ${{ secrets.LARK_NOTIFICATION_WEBHOOK_URL }} - STATUS: ${{ steps.publish.outcome }} + STATUS: ${{ needs.build-n-publish.result }} diff --git a/.github/workflows/scripts/generate_release_draft.py b/.github/workflows/scripts/generate_release_draft.py index 1c407cf14..dc592e4c9 100644 --- a/.github/workflows/scripts/generate_release_draft.py +++ b/.github/workflows/scripts/generate_release_draft.py @@ -57,7 +57,12 @@ def collate_release_info(commit_info_list): for commit_info in commit_info_list: author = commit_info['commit']['author']['name'] - author_url = commit_info['author']['url'] + + try: + author_url = commit_info['author']['url'] + except: + # author can be None + author_url = None msg = commit_info['commit']['message'] match = re.search(pattern, msg) @@ -86,7 +91,10 @@ def generate_release_post_markdown(current_version, last_version, release_info): # only keep the first line msg = msg.split('\n')[0] - item = f'{msg} by [{author}]({author_url})\n' + if author_url: + item = f'{msg} by [{author}]({author_url})\n' + else: + item = f'{msg} by {author}\n' text.append(f'- {item}') text.append('\n')