Add username for draft process (#913)

Upgrade the release plugin
juhaku · May 7, 2024 · 4168ff1 · 4168ff1
1 parent e0718de
commit 4168ff1
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 49 deletions.
diff --git a/.github/actions/gitlog/gitlog.sh b/.github/actions/gitlog/gitlog.sh
@@ -5,83 +5,96 @@
 output_file=""
 crate=""
 while true; do
-  case $1 in
-    "--output-file")
-      shift
-      output_file="$1"
-      shift
-    ;;
-    "--crate")
-      shift
-      crate="$1"
-      shift
-    ;;
-    *)
-      break
-    ;;
-  esac
+	case $1 in
+	"--output-file")
+		shift
+		output_file="$1"
+		shift
+		;;
+	"--crate")
+		shift
+		crate="$1"
+		shift
+		;;
+	*)
+		break
+		;;
+	esac
 done
 
 if [[ "$output_file" == "" ]]; then
-  echo "Missing --output-file <file> option argument, define path to file or - for stdout" && exit 1
+	echo "Missing --output-file <file> option argument, define path to file or - for stdout" && exit 1
 fi
 if [[ "$crate" == "" ]]; then
-  echo "Missing --crate <crate> option argument, need an explisit crate to get git log for" && exit 1
+	echo "Missing --crate <crate> option argument, need an explisit crate to get git log for" && exit 1
 fi
 
 from_commit=HEAD
 last_release=$(git tag --sort=-committerdate | grep -E "$crate-[0-9]*\.[0-9]*\.[0-9]*" | head -1)
 echo "Found tag: $last_release"
 if [[ "$last_release" == "" ]]; then
-  last_release=$(git tag --sort=-committerdate | head -1) # get last tag
-  echo "Using latest tag: $last_release"
+	last_release=$(git tag --sort=-committerdate | head -1) # get last tag
+	echo "Using latest tag: $last_release"
 fi
 
 commit_range=""
 if [[ $last_release != "" ]]; then
-  commit_range="$from_commit...$last_release"
+	commit_range="$from_commit...$last_release"
 else
-  commit_range="$from_commit"
+	commit_range="$from_commit"
 fi
 
 ancestry_path=""
 if [[ "$last_release" != "" ]]; then
-  ancestry_path="--ancestry-path"
+	ancestry_path="--ancestry-path"
 fi
 
-mapfile -t log_lines < <(git log --pretty=format:'(%h) %s' $ancestry_path $commit_range)
+mapfile -t log_lines < <(git log --pretty=format:'(%h) %s' $ancestry_path "$commit_range")
 
 function is_crate_related {
-  commit="$1"
-  changes="$(git diff --name-only "$commit"~ "$commit" | awk -F / '{print $1}' | xargs)"
-
-  is_related=false
-  if [[ "$changes" == *"$crate"* ]]; then
-    is_related=true
-  fi
-
-  echo $is_related
+	commit="$1"
+	changes="$(git diff --name-only "$commit"~ "$commit" | awk -F / '{print $1}' | xargs)"
+
+	is_related=false
+	if [[ "$changes" == *"$crate"* ]]; then
+		is_related=true
+	fi
+
+	echo $is_related
+}
+
+get_username() {
+	commit=$1
+	curl -sSL \
+		-H "Accept: application/vnd.github+json" \
+		-H "X-GitHub-Api-Version: 2022-11-28" \
+		https://api.github.com/repos/juhaku/utoipa/commits/"$commit" | jq -r .author.login
 }
 
 log=""
 for line in "${log_lines[@]}"; do
-  commit=$(echo "$line" | awk -F ' ' '{print $1}')
-  commit=${commit//[\(\)]/}
-
-  if [[ $(is_crate_related "$commit") == true ]]; then
-    log=$log"* $line\n"
-  fi
+	commit=$(echo "$line" | awk -F ' ' '{print $1}')
+	commit=${commit//[\(\)]/}
+
+	if [[ $(is_crate_related "$commit") == true ]]; then
+		user=$(get_username "$commit")
+		log=$log"* $line @$user\n"
+	fi
 done
 
 if [[ "$output_file" != "" ]]; then
-  if [[ "$output_file" == "-" ]]; then
-    echo -e "$log"
-  else
-    echo -e "$log" > "$output_file"
-  fi
+	if [[ "$output_file" == "-" ]]; then
+		echo -e "$log"
+	else
+		echo -e "$log" >"$output_file"
+	fi
 fi
 
 if [[ "$last_release" == "" ]]; then
-  last_release=$(git rev-list --reverse HEAD | head -1)
+	last_release=$(git rev-list --reverse HEAD | head -1)
+fi
+
+if [ -n "$GITHUB_OUTPUT" ]; then
+	echo "last_release=$last_release" >>"$GITHUB_OUTPUT"
 fi
-echo "::set-output name=last_release::$last_release"
+
diff --git a/.github/workflows/draft.yaml b/.github/workflows/draft.yaml
@@ -74,12 +74,10 @@ jobs:
       - name: Create release
         id: create_release
         if: ${{ steps.existing_release.outputs.is_new == 'true' }}
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v2.0.4
         with:
           tag_name: ${{ matrix.crate }}-${{ steps.release_info.outputs.version }}
-          release_name: ${{ matrix.crate }}-${{ steps.release_info.outputs.version }}
+          name: ${{ matrix.crate }}-${{ steps.release_info.outputs.version }}
           body_path: ./draft-changes.md
           draft: true
           prerelease: ${{ steps.release_info.outputs.is_prerelease }}