Merge #5889: fix: fallback to a commit hash in codesign.sh

42decd3c68 fix: fallback to a commit hash in `codesign.sh` (UdjinM6)

Pull request description:

  ## Issue being fixed or feature implemented
  We don't use tags in https://github.com/dashpay/dash-detached-sigs repo, we use branches so `git describe` fails...

  ## What was done?
  Add `--always` option to fallback to commit hash. Could do
  ```
  git_head_version() {
      git -C "$1" rev-parse --short=12 HEAD`
  }
  ```
  instead but using `describe` allows us to start using tags one day with no additional patches.

  ## How Has This Been Tested?

  ## Breaking Changes

  ## Checklist:
  - [x] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

Top commit has no ACKs.

Tree-SHA512: 71c89641d1e4d81612c7d19d0724627f11b4a986d950483d6bf93d3071b5b0f1de6fd6359eea27a247dc403199d5221aebb2827e89f0bf67ba69a03b1570c668
This commit is contained in:
pasta 2024-03-03 15:38:05 -06:00
commit 533d82ca5a
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984

View File

@ -38,7 +38,7 @@ ACTUAL_OUTDIR="${OUTDIR}"
OUTDIR="${DISTSRC}/output" OUTDIR="${DISTSRC}/output"
git_head_version() { git_head_version() {
recent_tag="$(git -C "$1" describe --abbrev=12 --dirty 2> /dev/null)" recent_tag="$(git -C "$1" describe --abbrev=12 --dirty --always 2> /dev/null)"
echo "${recent_tag#v}" echo "${recent_tag#v}"
} }