Feature: #deploy to main or master refs #188
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mrjonesbot
force-pushed
the
184/deploy-main-to-prod
branch
3 times, most recently
from
4e586dd to
6614ede
Compare
mrjonesbot
changed the title
mrjonesbot
force-pushed
the
184/deploy-main-to-prod
branch
from
6614ede to
ce368d3
Compare
mrjonesbot
changed the title
mrjonesbot
force-pushed
the
184/deploy-main-to-prod
branch
from
ce368d3 to
a0e1428
Compare
gabebw
reviewed
Oct 29, 2020
lib/parity/environment.rb
Outdated
| ) | ||
| end | ||
| end | ||
|
|
||
| def branch_ref | ||
| main_ref = `find .git/refs/heads/main` |
There was a problem hiding this comment.
It might be better to do this using the built-in Git command for finding a ref, just in case the file structure changes later:
# These will be true/false
main_ref_exists = system("git show-ref --verify --quiet refs/heads/master")
master_ref_exists = system("git show-ref --verify --quiet refs/heads/main")
if main_ref_exists && !master_ref_exists
"main"
else
"master"
end
mrjonesbot
force-pushed
the
184/deploy-main-to-prod
branch
4 times, most recently
from
e1cef4d to
c387eba
Compare
Checks for the presence of refs/heads/main and absence of refs/heads/master; if this condition is true, set ref to "main". If a master ref is present, set ref to "master".
mrjonesbot
force-pushed
the
184/deploy-main-to-prod
branch
from
c387eba to
9fb3c50
Compare
|
@gabebw This has been sitting for a bit, is it ready to merge? |
|
@mrjonesbot It looks good to me! I don't have merge permissions on this repo, though, so it's up to someone who does to merge this. Perhaps @geoffharcourt can merge it? |
| expect(Kernel).to have_received(:system).with(git_push_feature_branch_main) | ||
| end | ||
|
|
||
| it "deploys main production's main for evaluation" do |
There was a problem hiding this comment.
Nitpick: I think this is "deploys the main branch to production".
|
Looks great! Thank you for your contribution. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #184
Heroku has enabled pushing to main by default in a backwards compatible manner (does not affect master branches): https://devcenter.heroku.com/changelog-items/1829
The change checks for the presence of
mainand the absence ofmaster-- setting the branch ref appropriately.Avoids manual / global git configs and doesn't break projects where
masteris still the default branch.