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

Rebuild jaeger-ui if the tree does not match any tag exactly #4553

Merged
merged 1 commit into from Jun 29, 2023

Conversation

bobrik
Copy link
Contributor

@bobrik bobrik commented Jun 26, 2023

The previous behavior resulted in the prebuild upstream package being downloaded, even if the local tree has any changes, whether they are commited or not. This broke our internal build that has some patches applied. See:

Let's use a more strict approach and only use the prebuild package if the tag is exact and does not contain any extra changes.

The previous behavior resulted in the prebuild upstream package
being downloaded, even if the local tree has any changes,
whether they are commited or not. This broke our internal
build that has some patches applied. See:

* jaegertracing#4251 (comment)

Let's use a more strict approach and only use the prebuild package
if the tag is exact and does not contain any extra changes.

Signed-off-by: Ivan Babrou <github@ivan.computer>
@codecov
Copy link

codecov bot commented Jun 26, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.01 ⚠️

Comparison is base (3ed0928) 97.05% compared to head (28a499e) 97.04%.

❗ Current head 28a499e differs from pull request most recent head 2b8f725. Consider uploading reports for the commit 2b8f725 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4553      +/-   ##
==========================================
- Coverage   97.05%   97.04%   -0.01%     
==========================================
  Files         301      301              
  Lines       17817    17817              
==========================================
- Hits        17292    17291       -1     
- Misses        421      422       +1     
  Partials      104      104              
Flag Coverage Δ
unittests 97.04% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@yurishkuro
Copy link
Member

@bobrik could you elaborate a bit how your internal build is setup? Do you have a fork of both Jaeger and Jaeger-UI.

@bobrik
Copy link
Contributor Author

bobrik commented Jun 27, 2023

Yes, we have patches for both jaeger and jaeger-ui internally, so we build our own binaries for deployment.

@yurishkuro
Copy link
Member

I wonder if it makes more sense for you to have an option that can be passed to make that will skip the tag check & download and always go with full rebuild.

@bobrik
Copy link
Contributor Author

bobrik commented Jun 27, 2023

The only scenario where I can see it being useful is you want to rebuild with a changed environment (like node version), everything else should be covered by this change already. For this a bit more finessing might be required (I remember needing to nuke node_modules to make it build for me) and if you are in that territory, you probably can run yarn build directly.

I can add make rebuild-ui that would pass an env variable to ./scripts/rebuild-ui.sh to skip the download, but I'm not sure if it's something anyone would actually use.

@yurishkuro yurishkuro merged commit f282d9b into jaegertracing:main Jun 29, 2023
31 checks passed
kjschnei001 pushed a commit to kjschnei001/jaeger that referenced this pull request Jun 29, 2023
…racing#4553)

The previous behavior resulted in the prebuild upstream package being
downloaded, even if the local tree has any changes, whether they are
commited or not. This broke our internal build that has some patches
applied. See:

*
jaegertracing#4251 (comment)

Let's use a more strict approach and only use the prebuild package if
the tag is exact and does not contain any extra changes.

Signed-off-by: Ivan Babrou <github@ivan.computer>
Signed-off-by: KevinSchneider <kevin.schneider@target.com>
afzal442 pushed a commit to Cloud-Hacks/jaeger that referenced this pull request Jul 10, 2023
…racing#4553)

The previous behavior resulted in the prebuild upstream package being
downloaded, even if the local tree has any changes, whether they are
commited or not. This broke our internal build that has some patches
applied. See:

*
jaegertracing#4251 (comment)

Let's use a more strict approach and only use the prebuild package if
the tag is exact and does not contain any extra changes.

Signed-off-by: Ivan Babrou <github@ivan.computer>
Signed-off-by: Afzal Ansari <afzal442@gmail.com>
@bobrik bobrik deleted the ivan/rebuild-dirty branch August 2, 2023 16:42
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