This repository was archived by the owner on Oct 10, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Bunch of October Updates to the developer docs #50
Merged
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
e00e239
Updates what is open data services code
caprenter 49b91e7
Adds some paragraph headers to break up the text about git
caprenter db51946
Adds bold emphasis to key services in a large section
caprenter 69425f7
Adds a page under tools about huboard
caprenter 49ce1af
[#3] Add link to our public page on travis
caprenter 29d140f
[#10] Adds the public commitment to code to the checklist
caprenter e991cc1
[#7] Communicate with our users when we change e.g an api
caprenter 4ee3be7
[#21] Adds a line about README driven development
caprenter 344a4f0
[#28] Adds some cryptic but basic info about salt, pets, and cattle
caprenter 40f17cd
[#30] Adds another sentance to the checklist about more people checki…
caprenter faf31ee
Merge branch 'master' into october-update
Bjwebb 8807234
[#38][#17] Some more useful git things
caprenter 0477c4d
[#41] Adds a warning that only the first page will be fetched
Bjwebb c5e359a
[#44] Adds hyperpolyglot to list of useful stuff
caprenter 9f32f4e
[#47] We should link to huboard from readmes
caprenter File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,12 @@ | ||
| # Deployment | ||
|
|
||
| ## General approach | ||
|
|
||
| We do nearly all of our deployment with the salt deployment tool. http://saltstack.com/ | ||
|
|
||
| The repository at https://github.com/OpenDataServices/opendataservices-deploy provides lots of information for those familiar with salt. | ||
|
|
||
| We currently take a middle ground approach for semi automated deployments for our small setup. This has been described as "Pets with strong configuration management", in slide 17 from these [slides from CERN](http://www.slideshare.net/gmccance/cern-data-centre-evolution): | ||
|
|
||
| Future application architectures should use Cattle, but pets with strong configuration management are viable and still needed. | ||
|
|
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,10 +9,14 @@ In general each repository has: | |
|
|
||
| More specific information about the branches in a repository should be in the CONTRIBUTING.md file in each repository. Merges should be performed or overseen by the person listed in CONTRIBUTING.md. | ||
|
|
||
| ### Issues | ||
| We use #issueno to reference a GitHub issue from a commit (or OpenDataServices/reponame#issueno to reference an issue from another repository). Where a commit relates to one issue we use [#issueno] at the start of the commit messages to make it easier to scan by eye what issues commits relate to. We generally don't use "fixes #issueno" in order to leave closing issues until it's been checked that they're "Done" | ||
|
|
||
|
|
||
| ### Temporary Branches | ||
| In general having temporary commits on temporary branches is better than using git stash. It's harder to lose your work this way, and they can also be pushed to the server. `tmp-some_name` is our current ad hoc naming convention for temporary branches. If you have a temporary commit you can update it using `git commit --amend -a --date="`date`` | ||
|
|
||
| ### Branches or Forks? | ||
| We tend to work on branches within the repo in the OpenDataServices (or other relevant repository), rather than in personal forks, as this allows us all to take advantage of the same TravisCI setup etc. (Obviously external contributors will generally not have permissions for this, so will use their personal forks instead.). | ||
|
|
||
| ## git tips | ||
|
|
@@ -25,6 +29,16 @@ we want to collect - e.g. the different ways of identifying a commit | |
| - tags, branches, HEAD~2, hash, short hash 0 for use with the git diff | ||
| etc. | ||
|
|
||
| ### Push to 2 remotes at once | ||
|
|
||
| http://stackoverflow.com/questions/14290113/git-pushing-code-to-two-remotes#answer-14290145 | ||
|
|
||
| `git remote set-url --add` | ||
|
|
||
| ### git blame a diff | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should be in the previous commit 2854d48 |
||
|
|
||
| See https://github.com/dmnd/git-diff-blame and http://stackoverflow.com/questions/5098256/git-blame-prior-commits | ||
|
|
||
| ## Flow chart of steps if you mess up git commits | ||
|
|
||
| http://justinhileman.info/article/git-pretty/ | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| #Huboard | ||
|
|
||
| https://huboard.com/ | ||
|
|
||
| We tend to use huboard as a way to plan our work. | ||
|
|
||
| Where we use huboard to manage a repositories issues, we should add a link from the README so that others can find it. |
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be #38 not #37
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok - can you fix?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep