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.

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

Fix git revision in version command #274

Merged
merged 1 commit into from
Sep 14, 2023
Merged

Fix git revision in version command #274

merged 1 commit into from
Sep 14, 2023

Conversation

newhoggy
Copy link
Contributor

@newhoggy newhoggy commented Sep 14, 2023

Changelog

- description: |
    Fix git revision in `version` command
# uncomment types applicable to the change:
  type:
  # - feature        # introduces a new feature
  # - breaking       # the API has changed in a breaking way
  - compatible     # the API has changed but is non-breaking
  # - optimisation   # measurable performance improvements
  # - improvement    # QoL changes e.g. refactoring
  - bugfix         # fixes a defect
  # - test           # fixes/modifies tests
  # - maintenance    # not directly related to the code
  # - release        # related to a new release preparation
  # - documentation  # change in code docs, haddocks...

Context

Now that cardano-cli is in a separate repository from cardano-git-rev, it must invoke the Template Haskell function directly instead of via the gitRev function wrapper to get the correct git hash.

$ git log | head
commit faf0b83446351931f9de8357230c4b271a6e526b
Author: John Ky <john.ky@iohk.io>
Date:   Thu Sep 14 13:34:02 2023 +1000

    Fix git revision in version command

commit f02fe9c4494c1096b25ce72fc761730d702df3e1
Merge: 095fc4ae9 8bbf60211
Author: John Ky <newhoggy@gmail.com>
Date:   Thu Sep 14 02:29:20 2023 +0000
$ cabal exec -- cardano-cli version
cardano-cli 8.8.0.0 - linux-x86_64 - ghc-8.10
git rev f02fe9c4494c1096b25ce72fc761730d702df3e1

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • The change log section in the PR description has been filled in
  • New tests are added if needed and existing tests are updated. These may include:
    • golden tests
    • property tests
    • round trip tests
    • integration tests
      See Running tests for more details
  • The version bounds in .cabal files are updated
  • CI passes. See note on CI. The following CI checks are required:
    • Code is linted with hlint. See .github/workflows/check-hlint.yml to get the hlint version
    • Code is formatted with stylish-haskell. See .github/workflows/stylish-haskell.yml to get the stylish-haskell version
    • Code builds on Linux, MacOS and Windows for ghc-8.10.7 and ghc-9.2.7
  • The changelog section in the PR is updated to describe the change
  • Self-reviewed the diff

@newhoggy newhoggy marked this pull request as ready for review September 14, 2023 03:36
@newhoggy newhoggy changed the title Fix git revision in version command Fix git revision in version command Sep 14, 2023
@newhoggy newhoggy added this pull request to the merge queue Sep 14, 2023
Merged via the queue into main with commit d34580a Sep 14, 2023
20 of 24 checks passed
@newhoggy newhoggy deleted the newhoggy/fix-gitrev branch September 14, 2023 05:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants