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

Add handling for additional r10k args in validate for control_branch #61

Merged
merged 1 commit into from
Oct 5, 2021

Conversation

ananace
Copy link
Member

@ananace ananace commented Oct 4, 2021

Noticed that I'd missed these keys when I was writing the code, so a late PR that adds an example and tests.

This PR then also handles default_branch and default_branch_override when dealing with :control_branch, based on how R10K::Module::Git does the lookup

The resulting flow for figuring out the correct branch will then be; $CONTROL_BRANCH > current branch > :default_branch_override > $CONTROL_BRANCH_FALLBACK > :default_branch > 'main'

Verified

This commit was signed with the committer’s verified signature.
ananace Alexander "Ananace" Olofsson
This also handles default_branch and default_branch_override when
dealing with :control_branch, based on how R10K::Module::Git does the
lookup
@ananace ananace force-pushed the validate-control_branch branch from fd326fc to 1ed7a49 Compare October 5, 2021 08:46
@codecov
Copy link

codecov bot commented Oct 5, 2021

Codecov Report

Merging #61 (094dbf1) into master (994a7cc) will not change coverage.
The diff coverage is n/a.

❗ Current head 094dbf1 differs from pull request most recent head 1ed7a49. Consider uploading reports for the commit 1ed7a49 to get more accurate results
Impacted file tree graph

@@           Coverage Diff           @@
##           master      #61   +/-   ##
=======================================
  Coverage   50.81%   50.81%           
=======================================
  Files          11       11           
  Lines         429      429           
=======================================
  Hits          218      218           
  Misses        211      211           
Impacted Files Coverage Δ
lib/ra10ke/validate.rb 95.12% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 994a7cc...1ed7a49. Read the comment docs.

@bastelfreak bastelfreak merged commit b435f03 into voxpupuli:master Oct 5, 2021
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.

None yet

2 participants