Skip to content

Commit ae8a961

Browse files
PaebbelsPaebbels
authored
v6.2.0
2 parents 9e6bbd5 + e4b5ea3 commit ae8a961

3 files changed

Lines changed: 51 additions & 22 deletions

File tree

‎.github/workflows/Parameters.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ jobs:
260260
261261
currentMSYS2Version = "3.12"
262262
currentAlphaVersion = "3.14"
263-
currentAlphaRelease = "3.14.0-rc.2"
263+
currentAlphaRelease = "3.14.0-rc.3"
264264
265265
if systems == "":
266266
print("::error title=Parameter::system_list is empty.")

‎.github/workflows/PrepareJob.yml‎

Lines changed: 44 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,18 @@ on:
3535
type: string
3636

3737
outputs:
38+
on_default_branch:
39+
description: ""
40+
value: ${{ jobs.Prepare.outputs.on_default_branch }}
3841
on_main_branch:
3942
description: ""
4043
value: ${{ jobs.Prepare.outputs.on_main_branch }}
41-
on_dev_branch:
42-
description: ""
43-
value: ${{ jobs.Prepare.outputs.on_dev_branch }}
4444
on_release_branch:
4545
description: ""
4646
value: ${{ jobs.Prepare.outputs.on_release_branch }}
47+
on_dev_branch:
48+
description: ""
49+
value: ${{ jobs.Prepare.outputs.on_dev_branch }}
4750
is_regular_commit:
4851
description: ""
4952
value: ${{ jobs.Prepare.outputs.is_regular_commit }}
@@ -89,9 +92,10 @@ jobs:
8992
name: Extract Information
9093
runs-on: ubuntu-24.04
9194
outputs:
95+
on_default_branch: ${{ steps.Classify.outputs.on_default_branch }}
9296
on_main_branch: ${{ steps.Classify.outputs.on_main_branch }}
93-
on_dev_branch: ${{ steps.Classify.outputs.on_dev_branch }}
9497
on_release_branch: ${{ steps.Classify.outputs.on_release_branch }}
98+
on_dev_branch: ${{ steps.Classify.outputs.on_dev_branch }}
9599
is_regular_commit: ${{ steps.Classify.outputs.is_regular_commit }}
96100
is_merge_commit: ${{ steps.Classify.outputs.is_merge_commit }}
97101
is_release_commit: ${{ steps.Classify.outputs.is_release_commit }}
@@ -133,15 +137,17 @@ jobs:
133137
ANSI_NOCOLOR=$'\x1b[0m'
134138
135139
ref="${{ github.ref }}"
140+
on_default_branch="false"
136141
on_main_branch="false"
137-
on_dev_branch="false"
138142
on_release_branch="false"
143+
on_dev_branch="false"
139144
is_regular_commit="false"
140145
is_merge_commit="false"
141146
is_release_commit="false"
142147
is_nightly_tag="false"
143148
is_release_tag="false"
144149
ref_kind="unknown"
150+
default_branch=""
145151
branch=""
146152
tag=""
147153
pr_number=""
@@ -151,10 +157,18 @@ jobs:
151157
ref_kind="branch"
152158
branch="${ref:11}"
153159
160+
printf "Get default branch name ... "
161+
defaultBranch=$(gh repo view "${{ github.repository }}" --json defaultBranchRef --jq '.defaultBranchRef.name')
162+
if [[ $? -eq 0 ]]; then
163+
printf " ${ANSI_LIGHT_GREEN} [OK]\n"
164+
else
165+
printf " ${ANSI_LIGHT_RED} [FAILED]\n"
166+
fi
167+
154168
printf "Commit check:\n"
155169
156-
if [[ "${branch}" == "${{ inputs.main_branch }}" ]]; then
157-
on_main_branch="true"
170+
if [[ "${branch}" == "${defaultBranch}" ]]; then
171+
on_default_branch="true"
158172
159173
if [[ -z "$(git rev-list -1 --merges ${{ github.sha }}~1..${{ github.sha }})" ]]; then
160174
is_regular_commit="true"
@@ -163,11 +177,11 @@ jobs:
163177
is_merge_commit="true"
164178
printf " ${ANSI_LIGHT_GREEN}merge "
165179
fi
166-
printf "commit${ANSI_NOCOLOR} on main branch ${ANSI_LIGHT_BLUE}'%s'${ANSI_NOCOLOR}\n" "${{ inputs.main_branch }}"
180+
printf "commit${ANSI_NOCOLOR} on default branch ${ANSI_LIGHT_BLUE}'%s'${ANSI_NOCOLOR}\n" "${defaultBranch}"
167181
fi
168182
169-
if [[ "${branch}" == "${{ inputs.development_branch }}" ]]; then
170-
on_dev_branch="true"
183+
if [[ "${branch}" == "${{ inputs.main_branch }}" ]]; then
184+
on_main_branch="true"
171185
172186
if [[ -z "$(git rev-list -1 --merges ${{ github.sha }}~1..${{ github.sha }})" ]]; then
173187
is_regular_commit="true"
@@ -176,7 +190,7 @@ jobs:
176190
is_merge_commit="true"
177191
printf " ${ANSI_LIGHT_GREEN}merge "
178192
fi
179-
printf "commit${ANSI_NOCOLOR} on development branch ${ANSI_LIGHT_BLUE}'%s'${ANSI_NOCOLOR}\n" "${{ inputs.development_branch }}"
193+
printf "commit${ANSI_NOCOLOR} on main branch ${ANSI_LIGHT_BLUE}'%s'${ANSI_NOCOLOR}\n" "${{ inputs.main_branch }}"
180194
fi
181195
182196
if [[ "${branch}" == "${{ inputs.release_branch }}" ]]; then
@@ -191,20 +205,33 @@ jobs:
191205
fi
192206
printf "commit${ANSI_NOCOLOR} on release branch ${ANSI_LIGHT_BLUE}'%s'${ANSI_NOCOLOR}\n" "${{ inputs.release_branch }}"
193207
fi
208+
209+
if [[ "${branch}" == "${{ inputs.development_branch }}" ]]; then
210+
on_dev_branch="true"
211+
212+
if [[ -z "$(git rev-list -1 --merges ${{ github.sha }}~1..${{ github.sha }})" ]]; then
213+
is_regular_commit="true"
214+
printf " ${ANSI_LIGHT_YELLOW}regular "
215+
else
216+
is_merge_commit="true"
217+
printf " ${ANSI_LIGHT_GREEN}merge "
218+
fi
219+
printf "commit${ANSI_NOCOLOR} on development branch ${ANSI_LIGHT_BLUE}'%s'${ANSI_NOCOLOR}\n" "${{ inputs.development_branch }}"
220+
fi
194221
elif [[ "${ref:0:10}" == "refs/tags/" ]]; then
195222
ref_kind="tag"
196223
tag="${ref:10}"
197224
198225
printf "Tag check:\n"
199226
200-
printf " Check if tag is on release branch '%s' ... " "${{ inputs.release_branch }}"
201-
git branch --remotes --contains $(git rev-parse --verify "tags/${tag}~0") | grep "origin/${{ inputs.release_branch }}" > /dev/null
227+
printf " Check if tag is on main branch '%s' ... " "${{ inputs.main_branch }}"
228+
git branch --remotes --contains $(git rev-parse --verify "tags/${tag}~0") | grep "origin/${{ inputs.main_branch }}" > /dev/null
202229
if [[ $? -eq 0 ]]; then
203230
printf "${ANSI_LIGHT_GREEN}[OK]${ANSI_NOCOLOR}\n"
204231
else
205232
printf "${ANSI_LIGHT_RED}[FAILED]${ANSI_NOCOLOR}\n"
206-
printf "${ANSI_LIGHT_RED}Tag '%s' isn't on branch '%s'.${ANSI_NOCOLOR}\n" "${tag}" "${{ inputs.release_branch }}"
207-
printf "::error title=TagCheck::Tag '%s' isn't on branch '%s'.\n" "${tag}" "${{ inputs.release_branch }}"
233+
printf "${ANSI_LIGHT_RED}Tag '%s' isn't on branch '%s'.${ANSI_NOCOLOR}\n" "${tag}" "${{ inputs.main_branch }}"
234+
printf "::error title=TagCheck::Tag '%s' isn't on branch '%s'.\n" "${tag}" "${{ inputs.main_branch }}"
208235
exit 1
209236
fi
210237
@@ -240,9 +267,10 @@ jobs:
240267
fi
241268
242269
tee --append "${GITHUB_OUTPUT}" <<EOF
270+
on_default_branch=${on_default_branch}
243271
on_main_branch=${on_main_branch}
244-
on_dev_branch=${on_dev_branch}
245272
on_release_branch=${on_release_branch}
273+
on_dev_branch=${on_dev_branch}
246274
is_regular_commit=${is_regular_commit}
247275
is_merge_commit=${is_merge_commit}
248276
is_release_commit=${is_release_commit}

‎.github/workflows/PublishReleaseNotes.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -496,14 +496,14 @@ jobs:
496496
497497
# Create JSON inventory
498498
if [[ "${{ inputs.inventory-json }}" != "" ]]; then
499-
VERSION="1.0"
499+
STRUCT_VERSION="1.1"
500500
501501
# Use GitHub API to ask for latest version
502502
printf "Get latest released version via GitHub API ...\n"
503503
printf " gh release list --json tagName,isLatest --jq '.[] | select(.isLatest == true) | .tagName' "
504504
latestVersion=$(gh release list --json tagName,isLatest --jq '.[] | select(.isLatest == true) | .tagName')
505505
if [[ $? -eq 0 ]]; then
506-
if [[ -n "${latestVersion}" ]]; then
506+
if [[ -z "${latestVersion}" ]]; then
507507
printf "${ANSI_LIGHT_RED}[UNKNOWN]${ANSI_NOCOLOR}\n"
508508
latestVersion="unknown"
509509
else
@@ -528,7 +528,7 @@ jobs:
528528
fi
529529
530530
jsonInventory=$(jq -c -n \
531-
--arg version "${VERSION}" \
531+
--arg structVersion "${STRUCT_VERSION}" \
532532
--arg date "$(date +"%Y-%m-%dT%H-%M-%S%:z")" \
533533
--argjson jsonMeta "$(jq -c -n \
534534
--arg tag "${{ inputs.tag }}" \
@@ -538,15 +538,16 @@ jobs:
538538
--arg release "${{ github.server_url }}/${{ github.repository }}/releases/download/${{ inputs.tag }}" \
539539
--argjson jsonLatest "$(jq -c -n \
540540
--arg version "${latestVersion}" \
541-
'{"version": $version}' \
541+
--arg release "${{ github.server_url }}/${{ github.repository }}/releases/download/${latestVersion}" \
542+
'{"version": $version, "release-url": $release}' \
542543
)" \
543544
--argjson categories "$(jq -c -n \
544545
'$ARGS.positional' \
545546
--args "${inventoryCategories[@]}" \
546547
)" \
547548
'{"tag": $tag, "version": $version, "git-hash": $hash, "repository-url": $repo, "release-url": $release, "categories": $categories, "latest": $jsonLatest}' \
548549
)" \
549-
'{"version": 1.0, "timestamp": $date, "meta": $jsonMeta, "files": {}}'
550+
'{"version": $structVersion, "timestamp": $date, "meta": $jsonMeta, "files": {}}'
550551
)
551552
fi
552553

0 commit comments

Comments
 (0)