Fixed commented out workflow tasks !minor

callowayproject · Dec 18, 2023 · e52c683 · e52c683
1 parent 0a8e036
commit e52c683
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/.github/workflows/version.yaml b/.github/workflows/version.yaml
@@ -53,25 +53,21 @@ jobs:
             major|minor|patch)
               bump-my-version bump --allow-dirty --verbose "$RELEASE_KIND"
               echo "TAG_NAME=$(bump-my-version show current_version)" >> $GITHUB_ENV
-              # git push
-              # git push --tags
+              git push
+              git push --tags
               echo "PACKAGE=true" >> $GITHUB_ENV
               ;;
             dev)
-              echo "Temporary dev release for testing"
-              bump-my-version bump --allow-dirty --verbose --no-commit "$RELEASE_KIND"
-              echo "TAG_NAME=$(bump-my-version show current_version)" >> $GITHUB_ENV
-              echo "PACKAGE=true" >> $GITHUB_ENV
-              # echo "Intentionally not bumping version for dev release"
+              echo "Intentionally not bumping version for dev release"
               ;;
           esac
 
-#      - name: Package and upload artifacts
-#        if: ${{ env.PACKAGE == 'true' }}
-#        uses: ./.github/actions/package-and-upload-artifacts
-#        with:
-#          tag-name: ${{ env.TAG_NAME }}
+      - name: Package and upload artifacts
+        if: ${{ env.PACKAGE == 'true' }}
+        uses: ./.github/actions/package-and-upload-artifacts
+        with:
+          tag-name: ${{ env.TAG_NAME }}
 
-#      - name: Create a GitHub release
-#        if: ${{ env.PACKAGE == 'true' }}
-#        uses: ./.github/actions/release
+      - name: Create a GitHub release
+        if: ${{ env.PACKAGE == 'true' }}
+        uses: ./.github/actions/release
diff --git a/tools/bump.sh b/tools/bump.sh
@@ -5,9 +5,7 @@ RELEASE_KIND=$(generate-changelog --output release-hint)
 echo "::notice::Suggested release type is: ${RELEASE_KIND}"
 PR_NUMBER=$(gh pr view --json number -q .number || echo "")
 echo "::notice::PR number is: ${PR_NUMBER}"
-REVISION=$(git describe --tags --long | awk -F- '{print $2}')
-echo "::notice::Revision is: ${REVISION}"
-export PR_NUMBER REVISION
+export PR_NUMBER
 bump-my-version bump -v $RELEASE_KIND
 python -m build
 python -m twine upload dist/*