This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
wiki:development:release-howto-mswin [2015/02/25 13:31] mikedep333 correct creating a branch, so that it is not based off of a nameless branch |
wiki:development:release-howto-mswin [2017/03/11 20:40] (current) mikedep333 Fix typo |
||
|---|---|---|---|
| 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 35: | Line 35: | ||
| | 4 | <code bash>git push</ | | 4 | <code bash>git push</ | ||
| - | Now, perform a build with <ver-YYYYMMDD> as the version from X2Go-WinBuilder: | + | 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. | ||
| + | |||
| + | http:// | ||
| + | |||
| + | After completed, the build will be uploaded under [[http:// | ||
| + | |||
| + | |||
| + | If building PyHoca-GUI | ||
| - | http:// | ||
| http:// | http:// | ||
| Line 44: | 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 | | ||
| Line 51: | Line 68: | ||
| Follow-Up: | Follow-Up: | ||
| - | - Update symlink via SSH or SFTP: http:// | + | - Update symlink via SSH or SFTP: http:// |
| - Update link on home page http:// | - Update link on home page http:// | ||
| - Update BOTH links here http:// | - Update BOTH links here http:// | ||
| - Windows-Specific release notes http:// | - Windows-Specific release notes http:// | ||
| - Release email | - Release email | ||