└── README.md


/README.md:
--------------------------------------------------------------------------------
 1 | # addons-dev
 2 | 
 3 | Addons Forge
 4 | 
 5 | ## Typical development workflow:
 6 | 
 7 | * [Fork](#fork) - once per person
 8 | * [Clone](#clone) - once per computer
 9 | * [Create new branch](#create-new-branch) - once per addon (or set of addons). For managers only, because push access is needed.
10 | * [Get branch from upstream](#get-branch-from-upstream) - once per addon
11 | * [PR to addons-dev](#pr-to-addons-dev) - as much as needed.
12 | * Merge PR to addons-dev - as much as needed. For managers only.
13 | * [Final PR to target repo](#final-pr-to-target-repo) - once per addon
14 | * After accepting Final PR, addon is published at [apps store](https://www.odoo.com/apps/modules/browse?order=Newest) automatically with a delay of up to 24 hours
15 | * Further updates - PRs are sent directly to target repo.
16 | 
17 | # Fork
18 | Click Fork button at top right hand corner
19 | 
20 | # Clone
21 | 
22 | * Clone your fork to your machine:
23 | 
24 |         git clone git@github.com:USERNAME/addons-dev.git
25 | 
26 | * Add remotes
27 | 
28 |         cd addons-dev
29 | 
30 |         git remote add upstream          git@github.com:it-projects-llc/addons-dev.git
31 |         git remote add misc-addons       https://github.com/it-projects-llc/misc-addons.git
32 |         git remote add pos-addons        https://github.com/it-projects-llc/pos-addons.git
33 |         git remote add mail-addons       https://github.com/it-projects-llc/mail-addons.git
34 |         git remote add access-addons     https://github.com/it-projects-llc/access-addons.git
35 |         git remote add website-addons    https://github.com/it-projects-llc/website-addons.git
36 |         git remote add l10n-addons       https://github.com/it-projects-llc/l10n-addons.git
37 | 
38 | # Create new branch
39 | 
40 |     # specify target, repo and branch:
41 |     export REPO=misc-addons BRANCH=12.0 FEATURE=some_feature
42 | 
43 |     # fetch remote
44 |     git fetch ${REPO}
45 | 
46 |     # create new branch
47 |     git checkout -b ${REPO}-${BRANCH}-${FEATURE} ${REPO}/${BRANCH}
48 | 
49 |     # push to upstream
50 |     git push upstream ${REPO}-${BRANCH}-${FEATURE}
51 |     
52 |     # done
53 | 
54 | # Get branch from upstream
55 | 
56 | 
57 |     # get branch from upstream
58 |     git fetch upstream misc-addons-12.0-some_feature
59 |     git checkout -b misc-addons-12.0-some_feature upstream/misc-addons-12.0-some_feature
60 | 
61 | 
62 | # PR to addons-dev
63 | 
64 |    
65 |     # work and make commits
66 |     git commit ...
67 |    
68 |     # push to origin
69 |     git push origin misc-addons-11.0-some_feature
70 |    
71 |     # create pull request via github interface to it-projects-llc/addons-dev repo
72 | 
73 | # Final PR to target repo
74 | 
75 |     # example for misc-addons
76 |     cd /path/to/misc-addons
77 | 
78 |     # add remote if it doesn't exist yet
79 |     git remote add addons-dev https://github.com/it-projects-llc/addons-dev.git
80 | 
81 |     # fetch remote
82 |     git fetch addons-dev misc-addons-12.0-some_feature
83 | 
84 |     # create branch
85 |     git checkout -b 12.0-some-feature addons-dev/misc-addons-12.0-some_feature
86 |     
87 |     # Sync with upstream
88 |     git fetch upstream
89 |     git rebase upstream/12.0
90 | 
91 |     # push to your fork of target repo
92 |     git push origin 12.0-some-feature
93 | 
94 |     # create PR to target repo
95 | 


--------------------------------------------------------------------------------