You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Once approval has been received from all reviewers merge the PR using the "Create a merge commit" option. DO NOT SQUASH AND MERGE or REBASE AND MERGE!!!
Place the contents of deployments.sh in the directory above config directories.
Deployment
Start up a terminal and switch to the appropriate config directory.
cd /path/to/config/incent-config-[client-key]
Start a bash shell (if not already using bash).
bash
Source the deployments shell file with utility functions.
source ../deployment.sh
Set a variable for the program-set key we will be deploying.
program_set=[program-set-key]
Set a variable for the zoho ticket id (if applicable; the long id in url).
ticket=[long-id-from-url]
If GitHub issue doesn't exist (e.g. no ZOHO ticket because n/a program-set).
create_issue $program_set
Set a variable for the GitHub issue number related to this deployment.
issue=[issue-number]
Create a branch for the release.
create_release_branch
NOTE -- When the branch is created it will include the date and a "counter" (e.g. 2020-10-01/01). The counter here is hard-coded. If you are doing a second release for a program-set on a particular day you will want to rename the branch.
As an example (not to be copy and pasted). Note the final character has been incremented.
git branch -m release/2020-foo-bar/2020-10-01/02
This command, after creating a branch from master will print out a "best guess" of commits on config-changes that are not yet on master. This list will like include commits that have already landed, it's intended as a starting place. Use the output of this command and compare it to the release Google Sheet to identify commits that are ready to be released.
Pull in the appropriate commit(s) (sequentially).
git cherry-pick [sha]
# if more than one, repeat
Create a release request PR.
create_release_pr
Set a variable for the release pr number.
release_pr_number=[release-pr-number]
Wait for build to pass and then assign reviewers.
Once approval has been received from all reviewers merge the PR using the "Create a merge commit" option. DO NOT SQUASH AND MERGE or REBASE AND MERGE!!!
Checkout master (and delete release branch).
git checkout master
git pull
Set a variable for the sha of the merge commit that was just created on master.
sha=[merge-commit-sha]
Tag the merge commit with a release version.
tag_release
Additinal Steps
On GitHub add the label "Shipped" to each PR that was just merged.
Update the release Google Sheet for each PR that was just shipped with the corresponding release request URL.
Send an update on the originating ZOHO ticket (where applicable) stating the deployment is complete and including a link to the release PR.
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