Skip to content

Commit 5d2dc92

Browse files
committed
fixup! release: create initial Windows installer build workflow
Update the tag version validation to correctly look for release candidates in the version string. The `rcN` part optionally appears after x.y.z[.rcN] and not at the end of the entire VFS-version string. Also note that the tag looks like `-rcN` (with a dash), but the output from the version generation script is `.rcN` (with a period). Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com>
1 parent 54bbd4a commit 5d2dc92

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

.github/workflows/build-git-installers.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
- name: Validate tag
2424
run: |
2525
echo "$GITHUB_REF" |
26-
grep -E '^refs/tags/v2\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.vfs\.0\.(0|[1-9][0-9]*)(\.rc[0-9])?$' || {
27-
echo "::error::${GITHUB_REF#refs/tags/} is not of the form v2.<X>.<Y>.vfs.0.<W>[.rc<N>]" >&2
26+
grep -E '^refs/tags/v2\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-rc[0-9]+)?\.vfs\.0\.(0|[1-9][0-9]*)$' || {
27+
echo "::error::${GITHUB_REF#refs/tags/} is not of the form v2.<X>.<Y>[-rc<N>].vfs.0.<W>" >&2
2828
exit 1
2929
}
3030
- name: Determine tag to build
@@ -49,8 +49,11 @@ jobs:
4949
5050
# Verify tag follows rules in GIT-VERSION-GEN (i.e., matches the specified "DEF_VER" in
5151
# GIT-VERSION-FILE) and matches tag determined from trigger
52-
make GIT-VERSION-FILE
53-
test "${{ steps.tag.outputs.version }}" == "$(sed -n 's/^GIT_VERSION *= *//p'< GIT-VERSION-FILE)" || die "GIT-VERSION-FILE tag ($(cat GIT-VERSION-FILE)) does not match ${{ steps.tag.outputs.name }}"
52+
make GIT-VERSION-FILE
53+
expected_version="${{ steps.tag.outputs.version }}"
54+
# Convert -rc to .rc to match GIT-VERSION-FILE format
55+
expected_version="${expected_version//-rc/.rc}"
56+
test "$expected_version" == "$(sed -n 's/^GIT_VERSION *= *//p'< GIT-VERSION-FILE)" || die "GIT-VERSION-FILE tag ($(cat GIT-VERSION-FILE)) does not match ${{ steps.tag.outputs.name }}"
5457
# End check prerequisites for the workflow
5558

5659
# Build Windows installers (x86_64 & aarch64; installer & portable)
@@ -768,7 +771,7 @@ jobs:
768771
shell: bash
769772
run: |
770773
"${{ matrix.component.command }}" --version | sed 's/git version //' >actual
771-
echo ${{ needs.prereqs.outputs.tag_version }} >expect
774+
echo "${{ needs.prereqs.outputs.tag_version }}" | sed 's/-rc/.rc/g' >expect
772775
cmp expect actual || exit 1
773776
774777
- name: Validate universal binary CPU architecture

0 commit comments

Comments
 (0)