Skip to content
This repository was archived by the owner on Jan 28, 2022. It is now read-only.

New branching model - #34

Open
LeZuse wants to merge 8 commits into
masterfrom
full-sha
Open

New branching model#34
LeZuse wants to merge 8 commits into
masterfrom
full-sha

Conversation

@LeZuse

@LeZuse LeZuse commented Jun 30, 2017

Copy link
Copy Markdown
Contributor

Adding true native support for deploy branches. Please see updated README for more info.

@LeZuse LeZuse added the WIP label Jun 30, 2017
@LeZuse
LeZuse requested a review from MicTech July 3, 2017 13:50
@LeZuse
LeZuse changed the base branch from node8-rewrite to master July 3, 2017 14:15
@LeZuse

LeZuse commented Jul 3, 2017

Copy link
Copy Markdown
Contributor Author

@MicTech Would you mind taking a look on this? :)

@MicTech

MicTech commented Jul 4, 2017

Copy link
Copy Markdown
Member

@LeZuse I'd like to, but some better description would help ;)

@LeZuse

LeZuse commented Jul 4, 2017

Copy link
Copy Markdown
Contributor Author

@MicTech sorry about that. I will create some explaining docs

Comment thread bin/deploy.sh
echo "To activate the branch (auto updated revision with every branch deploy):"
echo "\t${CYAN}activate-branch --env=$ENV --branch=$BRANCH --notify$NC\n"
echo "To activate the commit:"
echo "\t${CYAN}activate-rev --env=$ENV --rev=$COMMIT --branch=$BRANCH --notify$NC\n"

@LeZuse LeZuse Jul 10, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

We don't really allow that in the current version. We should change the wording a bit.

@LeZuse

LeZuse commented Jul 10, 2017

Copy link
Copy Markdown
Contributor Author

@MicTech I added a short readme section to explain the new branching model. Would you mind taking a look at it? Thanks

Comment thread README.md
## Activation
There are two steps to activate a deployed build.
1. Activate branch: use `activate-branch --branch branchname` to activate this branch and set the current main build to the tip of this branch. All consecutive activations **inside this branch** will be automatically promoted as the main current build.
2. Activate a revision: use `activate-rev --branch branchname --rev SHA` to activate a given SHA revision inside a given branch and set the revision as the main current build **if that branch has been previously activated**.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why do you need branch here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

That's how the new setup works. You activate revs inside branches the same way you move a branch tip in Git.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

But you don't need information about the branch. There isn't a relation between branch and SHA.

Comment thread deploy-config-example.js
host: 'pub-redis-9999.us-east-1-1.2.ec2.garantiadata.com',
port: 9999,
db: 0,
host: 'pub-redis-9999.us-east-1-1.2.ec2.garantiadata.com',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this good idea to have those URL in the repository?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Anything that's not supposed to be in the repo can be in the secrets.js file. I'd leave it up to the library user which parts they consider to be a secret :)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants