Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

releng/version.sh: fix git-based version detection #589

Merged
merged 1 commit into from
Feb 4, 2024
Merged

releng/version.sh: fix git-based version detection #589

merged 1 commit into from
Feb 4, 2024

Conversation

ahesford
Copy link
Member

@ahesford ahesford commented Feb 4, 2024 •
edited
Loading

  1. Correct typo: --abbrev-rev -> --abbrev-ref
  2. Limit repository search to the current directory

Fixes: #588.

To reproduce the issue fixed by (2) and confirm the fix, do something like

cd $XBPS_DISTDIR
mkdir test
cd test

curl -L https://github.com/zbm-dev/zfsbootmenu/archive/v2.3.0.tar.gz | tar -zxvf -
( cd zfsbootmenu-2.3.0 && make show-version )
# ZFSBootMenu version: 1.0-439-gc274c0d8016

curl -L https://github.com/zbm-dev/zfsbootmenu/archive/git-er-done.tar.gz | tar -zxvf -
( cd zfsbootmenu-git-er-done && make show-version )
# ZFSBootMenu version: 2.3.0+dev

@ahesford
releng/version.sh: fix git-based version detection
84dfd23 
1. Correct typo: --abbrev-rev -> --abbrev-ref
2. Limit repository search to the current directory

Fixes: #588.
@ahesford ahesford mentioned this pull request Feb 4, 2024
Closed
@wboschman
Copy link

wboschman commented Feb 4, 2024 •
edited
Loading

tested for git-er-done with makepkg and it builds ok.

NAME="ZFSBootMenu"
PRETTY_NAME="ZFSBootMenu"
ID="zfsbootmenu"
ID_LIKE="void"
HOME_URL="https://zfsbootmenu.org"
DOCUMENTATION_URL="https://docs.zfsbootmenu.org"
BUG_REPORT_URL="https://github.com/zbm-dev/zfsbootmenu/issues"
SUPPORT_URL="https://github.com/zbm-dev/zfsbootmenu/discussions"
VERSION="2.3.0+dev"

@ahesford
Copy link
Member Author

ahesford commented Feb 4, 2024

Thanks for testing!

@ahesford ahesford merged commit dae859d into master Feb 4, 2024
2 checks passed
@ahesford ahesford deleted the git-er-done branch February 4, 2024 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@classabbyamp classabbyamp classabbyamp approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

installing zfsbootmenu 2.3.0 on arch results in error
3 participants
@ahesford @wboschman @classabbyamp