diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 781a27ab..c1ad1790 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -30,12 +30,18 @@ jobs: - name: Set version envs 2/3 run: | - echo "DATE_COMMIT_COUNT=$(git rev-list --count master --since='${{ env.DATE }} 00:00:00')" >> $GITHUB_ENV + DATE_COMMIT_COUNT_=$(git rev-list --count master --since='${{ env.DATE }} 00:00:00') + if [ $DATE_COMMIT_COUNT = "0" ] + then + echo "DATE_COMMIT_COUNT=$DATE_COMMIT_COUNT_" >> $GITHUB_ENV + else + echo "DATE_COMMIT_COUNT=$(($DATE_COMMIT_COUNT_-1))" >> $GITHUB_ENV + fi - name: Set version envs 3/3 run: | echo "LOCAL_VERSION=${{ env.DATE }}+${{ env.COMMIT_HASH }}" >> $GITHUB_ENV - if [ ${{ env.DATE_COMMIT_COUNT }} = "0" ] + if [ ${{ env.DATE_COMMIT_COUNT }} = "1" ] then echo "PYPI_VERSION=${{ env.DATE }}" >> $GITHUB_ENV else