This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision Last revision Both sides next revision | ||
wiki:development:release-howto-mswin [2015/07/31 04:31] mikedep333 x2goclient should be built using jenkins |
wiki:development:release-howto-mswin [2016/09/20 22:36] mikedep333 Steps for build-main-mswin branch |
||
---|---|---|---|
Line 7: | Line 7: | ||
^ Variable ^ Meaning ^ | ^ Variable ^ Meaning ^ | ||
| ''< | | ''< | ||
- | | ''< | + | | ''< |
- | | ''< | + | | ''< |
- | | ''< | + | | ''< |
| ''< | | ''< | ||
Line 18: | Line 18: | ||
| 2 | <code bash>cd < | | 2 | <code bash>cd < | ||
| 3 | <code bash>git fetch --all </ | | 3 | <code bash>git fetch --all </ | ||
- | | 4 | <code bash>git checkout -b < | + | | 4 | <code bash>git checkout -b <release/ver-mswin> |
If a branch already exists: | If a branch already exists: | ||
Line 24: | Line 24: | ||
| 1 | <code bash>git clone ...</ | | 1 | <code bash>git clone ...</ | ||
| 2 | <code bash>cd < | | 2 | <code bash>cd < | ||
- | | 3 | <code bash>git checkout < | + | | 3 | <code bash>git checkout <release/ver-mswin></ |
| 4 | <code bash>git pull --rebase</ | | 4 | <code bash>git pull --rebase</ | ||
Line 34: | Line 34: | ||
| 3 | <code bash>git commit -am ' | | 3 | <code bash>git commit -am ' | ||
| 4 | <code bash>git push</ | | 4 | <code bash>git push</ | ||
+ | |||
+ | Update the build-main-mswin branch. If you created a branch earlier: | ||
+ | ^ No ^ Command | ||
+ | | 1 | <code bash>git branch -f build-main-mswin < | ||
+ | | 2 | Ask the X2Go git admin to run the same command on the server | Currently, Ionic is the admin | | ||
+ | |||
+ | If you did not create a branch earlier: | ||
+ | ^ No ^ Command | ||
+ | | 1 | <code bash>git checkout build-main-mswin </ | ||
+ | | 2 | <code bash>git merge --ff-only < | ||
+ | | 3 | <code bash>git push</ | ||
Now, if building X2Go Client, perform a build using Jenkins. | Now, if building X2Go Client, perform a build using Jenkins. | ||
Line 42: | Line 53: | ||
- | If building PyHoca-GUI perform a build with <ver-YYYYMMDD> as the version from X2Go-WinBuilder: | + | If building PyHoca-GUI perform a build with <ver-YYYY.MM.DD> as the version from X2Go-WinBuilder: |
http:// | http:// | ||
Line 50: | Line 61: | ||
Once tested: | Once tested: | ||
- | | 1 | <code bash>git tag -s '< | + | | 1 | <code bash>git tag -s '< |
| 2 | <code bash>git push --tags</ | | 2 | <code bash>git push --tags</ | ||
| 3 | Upload the installers to code.x2go.org | FIXME: Fill in details | | | 3 | Upload the installers to code.x2go.org | FIXME: Fill in details | |