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

chore: Modify the way the binary version is set when compiling (backport #388) #390

Merged
merged 3 commits into from
Jun 24, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 17, 2024

Description

  • Modify the way the binary version is set when compiling.
    • if main branch, main-f71e2e77b45e64df1ae8790b61f80b192350d688.
    • if feat/compile_with_tags branch, feat_compile_with_tags-726c33ee7d7aad03cc4c705c97acbffc67b39bd4.
    • if v4.0.0 tag commit, v4.0.0

Motivation and context

When compiled with the following command, v4.0.0 is not output.

git clone https://github.com/Finschia/finschia
cd finschia && git checkout v4.0.0
make install

fnsad version
# HEAD-0d1b05018dc6fa8265f3bc35d9066cbe644c96b3

How has this been tested?

Screenshots (if appropriate):

Checklist:

  • I followed the contributing guidelines and code of conduct.
  • I have added a relevant changelog to CHANGELOG.md
  • I have added tests to cover my changes.
  • I have updated the documentation accordingly.

This is an automatic backport of pull request #388 done by [Mergify](https://mergify.com).

* chore: modify how binary version is defined

Signed-off-by: zemyblue <zemyblue@gmail.com>

* chore: update changelog

Signed-off-by: zemyblue <zemyblue@gmail.com>

---------

Signed-off-by: zemyblue <zemyblue@gmail.com>
(cherry picked from commit 7d99e17)

# Conflicts:
#	CHANGELOG.md
Copy link
Author

mergify bot commented Jun 17, 2024

Cherry-pick of 7d99e17 has failed:

On branch mergify/bp/release/v4.0.x/pr-388
Your branch is up to date with 'origin/release/v4.0.x'.

You are currently cherry-picking commit 7d99e17.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Makefile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Signed-off-by: zemyblue <zemyblue@gmail.com>
Signed-off-by: zemyblue <zemyblue@gmail.com>
@zemyblue zemyblue merged commit 6047f74 into release/v4.0.x Jun 24, 2024
37 checks passed
@zemyblue zemyblue deleted the mergify/bp/release/v4.0.x/pr-388 branch June 24, 2024 01:18
@zemyblue zemyblue mentioned this pull request Jun 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants