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.

Sign up for GitHub

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

Jump to bottom

Ignore build number in unit tests that check build number. #15417

Merged
merged 1 commit into from Apr 4, 2023
Merged

Ignore build number in unit tests that check build number. #15417

merged 1 commit into from Apr 4, 2023

Conversation

hpidcock
Copy link
Member

@hpidcock hpidcock commented Apr 4, 2023

Changes to the Makefile for cgo introduced build number into unit tests. This should be allowed, but some tests need to be made resilient to this.

QA steps

Run unit tests with and without -ldflags "-X github.com/juju/juju/version.build=12345"

Documentation changes

N/A

Bug reference

N/A

barrettj12
barrettj12 approved these changes Apr 4, 2023
View reviewed changes
Copy link
Contributor

@barrettj12 barrettj12 left a comment

Choose a reason for hiding this comment

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

LGTM, assuming you've tested it

@hpidcock
Copy link
Member Author

hpidcock commented Apr 4, 2023

/merge

@jujubot jujubot merged commit 7f2436b into juju:3.2 Apr 4, 2023
16 of 17 checks passed
@jack-w-shaw jack-w-shaw mentioned this pull request Apr 17, 2023
Merged
jujubot added a commit that referenced this pull request Apr 17, 2023
@jujubot
Merge pull request #15494 from jack-w-shaw/3.2-into-develop
44387bc 
#15494

Merges:
- #15399
- #15395
- #15414
- #15417
- #15418
- #15419
- #15413
- #15420
- #15422
- #15424
- #15416
- #15428
- #15423
- #15426

Conflicts resolved trivially
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@barrettj12 barrettj12 barrettj12 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@hpidcock @barrettj12 @jujubot