Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

Get build number from BUILD_NUMBER file if not in a repo#7922

Merged
rimashah25 merged 2 commits intoapache:masterfrom
zrhoffman:ciab-makefile-use-build-number
Jan 24, 2024
Merged

Get build number from BUILD_NUMBER file if not in a repo#7922
rimashah25 merged 2 commits intoapache:masterfrom
zrhoffman:ciab-makefile-use-build-number

Conversation

@zrhoffman
Copy link
Member

Fixes #7921 by making the CDN in a Box makefile fall back to getting the build number fro the BUILD_NUMBER file that is generated for releases if the traffic control directory is not a git repository.


Which Traffic Control components are affected by this PR?

  • CDN in a Box

What is the best way to verify this PR?

Confirm the makefile works without a git repo:

mv .git .git.moved
cd infrastructure/cdn-in-a-box
make traffic_ops/traffic_ops.rpm

If this is a bugfix, which Traffic Control versions contained the bug?

  • 8.0.0 (RC5)
  • 7.0.1

PR submission checklist

@zrhoffman zrhoffman added bug something isn't working as intended cdn-in-a-box related to the Docker-based CDN-in-a-Box system build related to the build process labels Jan 23, 2024
@zrhoffman zrhoffman requested a review from knutsel January 23, 2024 15:58
@zrhoffman zrhoffman mentioned this pull request Jan 23, 2024
4 tasks
@zrhoffman zrhoffman force-pushed the ciab-makefile-use-build-number branch from 13c81fc to 372cb6b Compare January 23, 2024 18:51
@zrhoffman
Copy link
Member Author

Rebased onto 4b6af89

@zrhoffman zrhoffman force-pushed the ciab-makefile-use-build-number branch from 372cb6b to 4db8c5a Compare January 24, 2024 08:25
Copy link
Member

@knutsel knutsel left a comment

Choose a reason for hiding this comment

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

LGTM - tested this Makefile by putting it in the previous 8.0.0 release and I know have a running CDN-in-a-Box!
Thanks!

@rimashah25 rimashah25 merged commit 13488f8 into apache:master Jan 24, 2024
rimashah25 pushed a commit that referenced this pull request Jan 24, 2024
* Break $(shell) function into multiple lines for readability

* Get build number from BUILD_NUMBER file if not in a git repo

(cherry picked from commit 13488f8)
@zrhoffman zrhoffman deleted the ciab-makefile-use-build-number branch January 24, 2024 17:10
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

bug something isn't working as intended build related to the build process cdn-in-a-box related to the Docker-based CDN-in-a-Box system

Projects

None yet

Development

Successfully merging this pull request may close these issues.

cp: cannot stat '../../dist/traffic_ops-8.0.0-0..el8.x86_64.rpm': No such file or directory

3 participants