Skip to content

Commit 4b0b103

Browse files
authored
v5.3.0
2 parents d48de1d + ba6f55d commit 4b0b103

1 file changed

Lines changed: 15 additions & 4 deletions

File tree

.github/workflows/PrepareJob.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
version: ${{ steps.Classify.outputs.version || steps.FindPullRequest.outputs.pr_version }}
104104
# release_version: ${{ steps.FindPullRequest.outputs.release_version }}
105105
pr_title: ${{ steps.FindPullRequest.outputs.pr_title }}
106-
pr_number: ${{ steps.FindPullRequest.outputs.pr_number }}
106+
pr_number: ${{ steps.Classify.outputs.pr_number || steps.FindPullRequest.outputs.pr_number }}
107107

108108
steps:
109109
- name: ⏬ Checkout repository
@@ -144,6 +144,7 @@ jobs:
144144
ref_kind="unknown"
145145
branch=""
146146
tag=""
147+
pr_number=""
147148
version=""
148149
149150
if [[ "${ref:0:11}" == "refs/heads/" ]]; then
@@ -225,6 +226,13 @@ jobs:
225226
printf "::error title=RexExpCheck::Tag name '%s' doesn't conform to regexp '%s' nor '%s'.\n" "${tag}" "${NIGHTLY_TAG_PATTERN}" "${RELEASE_TAG_PATTERN}"
226227
exit 1
227228
fi
229+
elif [[ "${ref:0:10}" == "refs/pull/" ]]; then
230+
ref_kind="pullrequest"
231+
pr_number=${ref:11}
232+
pr_number=${pr_number%%/*}
233+
234+
printf "Pull Request check:\n"
235+
printf " Number: %s\n" "${pr_number}"
228236
else
229237
printf "${ANSI_LIGHT_RED}Unknown Git reference '%s'.${ANSI_NOCOLOR}\n" "${{ github.ref }}"
230238
printf "::error title=Classify Commit::Unknown Git reference '%s'.\n" "${{ github.ref }}"
@@ -243,6 +251,7 @@ jobs:
243251
ref_kind=${ref_kind}
244252
branch=${branch}
245253
tag=${tag}
254+
pr_number=${pr_number}
246255
version=${version}
247256
EOF
248257
@@ -327,8 +336,10 @@ jobs:
327336
printf "ref_kind: %s\n" "${{ steps.Classify.outputs.ref_kind }}"
328337
printf "branch: %s\n" "${{ steps.Classify.outputs.branch }}"
329338
printf "tag: %s\n" "${{ steps.Classify.outputs.tag }}"
330-
printf "version from tag: %s\n" "${{ steps.Classify.outputs.version }}"
331-
printf "version from pr: %s\n" "${{ steps.FindPullRequest.outputs.pr_version }}"
332339
printf "version: %s\n" "${{ steps.Classify.outputs.version || steps.FindPullRequest.outputs.pr_version }}"
340+
printf " from tag: %s\n" "${{ steps.Classify.outputs.version }}"
341+
printf " from pr: %s\n" "${{ steps.FindPullRequest.outputs.pr_version }}"
333342
printf "pr title: %s\n" "${{ steps.FindPullRequest.outputs.pr_title }}"
334-
printf "pr number: %s\n" "${{ steps.FindPullRequest.outputs.pr_number }}"
343+
printf "pr number: %s\n" "${{ steps.Classify.outputs.pr_number || steps.FindPullRequest.outputs.pr_number }}"
344+
printf " from merge: %s\n" "${{ steps.Classify.outputs.pr_number }}"
345+
printf " from pr: %s\n" "${{ steps.FindPullRequest.outputs.pr_number }}"

0 commit comments

Comments
 (0)