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

Makefile: simpily ledger build tags #2449

Merged
merged 1 commit into from
Sep 8, 2023
Merged

Conversation

MSevey
Copy link
Member

@MSevey MSevey commented Sep 7, 2023

In the process of working on the goreleaser PR I discovered that how we are building the BUILD_TAGS is overly verbose and unnecessary.

Ultimately we are just trying to add ledger to -tags. Hardcoding it and adding a note in the README for the 2 distributions that aren't supported seemed easier to maintain.

@github-actions
Copy link

github-actions bot commented Sep 7, 2023

PR Preview Action v1.4.4
🚀 Deployed preview to https://celestiaorg.github.io/celestia-app/pr-preview/pr-2449/
on branch gh-pages at 2023-09-07 21:00 UTC


# process linker flags
ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=celestia-app \
-X github.com/cosmos/cosmos-sdk/version.AppName=celestia-appd \
-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing this line had zero impact on ledger it seemed. If someone knows why this line is needed, I'm happy to add it back in.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears to have been added in #360 but build_tags_comma_sep wasn't defined in that PR so it seems like it was a no-op when first introduced.


# process linker flags
ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=celestia-app \
-X github.com/cosmos/cosmos-sdk/version.AppName=celestia-appd \
-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)"
ldflags += $(LDFLAGS)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LDFLAGS isn't defined anywhere so this line is a no-op.

@MSevey MSevey marked this pull request as ready for review September 7, 2023 21:02
@codecov-commenter
Copy link

Codecov Report

Merging #2449 (a4aa0a5) into main (2afebb7) will not change coverage.
Report is 1 commits behind head on main.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #2449   +/-   ##
=======================================
  Coverage   20.61%   20.61%           
=======================================
  Files         131      131           
  Lines       15270    15270           
=======================================
  Hits         3148     3148           
  Misses      11820    11820           
  Partials      302      302           

📢 Have feedback on the report? Share it here.

@MSevey MSevey enabled auto-merge (squash) September 7, 2023 21:20
Copy link
Collaborator

@rootulp rootulp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the clean up!

[nit] PR title could use a conventional commit prefix so that the squashed commit has a conventional commit prefix so that the auto generated release notes are easy to scan and identify if the next release should be a major, minor, or patch release.


# process linker flags
ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=celestia-app \
-X github.com/cosmos/cosmos-sdk/version.AppName=celestia-appd \
-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears to have been added in #360 but build_tags_comma_sep wasn't defined in that PR so it seems like it was a no-op when first introduced.

@MSevey MSevey merged commit 67241f9 into main Sep 8, 2023
29 checks passed
@MSevey MSevey deleted the sevey/ledger-build-cleanup branch September 8, 2023 05:26
@rootulp rootulp added the backport:v1.x PR will be backported automatically to the v1.x branch upon merging label Oct 4, 2023
mergify bot pushed a commit that referenced this pull request Oct 4, 2023
In the process of working on the `goreleaser` PR I discovered that how
we are building the `BUILD_TAGS` is overly verbose and unnecessary.

Ultimately we are just trying to add `ledger` to `-tags`. Hardcoding it
and adding a note in the README for the 2 distributions that aren't
supported seemed easier to maintain.

(cherry picked from commit 67241f9)

# Conflicts:
#	specs/src/SUMMARY.md
rootulp added a commit that referenced this pull request Oct 5, 2023
This is an automatic backport of pull request #2449 done by
[Mergify](https://mergify.com).

Closes #2597

---------

Co-authored-by: Matthew Sevey <[email protected]>
Co-authored-by: Rootul P <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:v1.x PR will be backported automatically to the v1.x branch upon merging
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants