Differences

This shows you the differences between two versions of the page.

--- wiki:development:release-howto-mswin [2015/02/25 13:19]
mikedep333 Simpify steps to create a branch.
+++ wiki:development:release-howto-mswin [2017/03/11 20:40] (current)
mikedep333 Fix typo
@@ Line 7: / Line 7: @@
 ^ Variable ^ Meaning ^
 | ''<ver>'' | Existing released version. For example, 4.0.3.2  |
-| ''<ver-mswin>'' | Branch off of a released version. For example, 4.0.3.2-mswin |
+| ''<release/ver-mswin>'' | Branch off of a released version. For example, 4.0.3.2-mswin |
-| ''<ver-YYYYMMDD>'' | New Windows-specific version. For example, 4.0.3.2-20150201 (for February 1st, 2015) |
+| ''<ver-YYYY.MM.DD>'' | New Windows-specific version. For example, 4.0.3.2-20150201 (for February 1st, 2015) |
-| ''<ver-YYYYMMDD-mswin>'' | Git tag for the new Windows-specific version. For example, 4.0.3.2-20150201-mswin (for February 1st, 2015) |
+| ''<ver-YYYY.MM.DD-mswin>'' | Git tag for the new Windows-specific version. For example, 4.0.3.2-20150201-mswin (for February 1st, 2015) |
 | ''<component>'' | Git name of the to-be-released component. |
@@ Line 18: / Line 18: @@
 |  2  | <code bash>cd <component></code> | |
 |  3  | <code bash>git fetch --all </code> | If the repo already exists, you will follow this step instead of step 1. |
-|  4  | <code bash>git checkout <ver> </code> | |
+|  4  | <code bash>git checkout -b <release/ver-mswin> <ver> </code> | | Creates a branch off of the released tag
-|  5  | <code bash>git checkout -b <ver-mswin> </code> | | Creates a branch
 If a branch already exists:
@@ Line 25: / Line 24: @@
 |  1  | <code bash>git clone ...</code> | Clone repository on on your machine (cygwin) with git, if it doesn't already exist. |
 |  2  | <code bash>cd <component></code> | |
-|  3  | <code bash>git checkout <ver-mswin></code> | Only necessary, if you're not already on the branch. Check via ''git status''. |
+|  3  | <code bash>git checkout <release/ver-mswin></code> | Only necessary, if you're not already on the branch. Check via ''git status''. |
 |  4  | <code bash>git pull --rebase</code> | Always make sure the repository is up-to-date. |
@@ Line 36: / Line 35: @@
 |  4  | <code bash>git push</code> | |
-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  ^  Tips / Comment  ^
+|  1  | <code bash>git branch -f build-main-mswin <release/ver-mswin></code> |
+|  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  ^  Tips / Comment  ^
+|  1  | <code bash>git checkout build-main-mswin </code> | |
+|  2  | <code bash>git merge --ff-only <release/ver-mswin></code> | |
+|  3  | <code bash>git push</code> | |
+Now, if building X2Go Client, perform a build using Jenkins.
+http://jenkins.x2go.org:8080/view/All%20Releases/
+After completed, the build will be uploaded under [[http://code.x2go.org/releases/binary-win32/x2goclient/heuler/|the heuler folder]] (and will not have the git commit hash in its filename, which sets it apart from the nightly builds.)
+If building PyHoca-GUI perform a build with <ver-YYYY.MM.DD> as the version from X2Go-WinBuilder:
-http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient
 http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:pyhoca-gui
@@ Line 45: / Line 61: @@
 Once tested:
-|  1  | <code bash>git tag -s '<ver-YYYYMMDD-mswin>' -m 'Windows-Specific Release <ver-YYYYMMDD>'</code> | Run this **on your own machine** in your **checked-out, updated** copy (see steps 2 to 5.) Make sure your ''gnupg'' system is set up correctly and you have default key set. |
+|  1  | <code bash>git tag -s '<ver-YYYY.MM.DD-mswin>' -m 'Windows-Specific Release <ver-YYYY.MM.DD>'</code> | Run this **on your own machine** in your **checked-out, updated** copy (see steps 2 to 5.) Make sure your ''gnupg'' system is set up correctly and you have default key set. |
 |  2  | <code bash>git push --tags</code> | Run this **on your own machine** to push the new tag. |
 |  3  | Upload the installers to code.x2go.org | FIXME: Fill in details |
@@ Line 52: / Line 68: @@
 Follow-Up:
-  - Update symlink via SSH or SFTP: http://code.x2go.org/releases/PyHoca-GUI_latest_mswin32-setup.exe or http://code.x2go.org/releases/PyHoca-GUI_latest_mswin32-setup.exe
+  - Update symlink via SSH or SFTP: http://code.x2go.org/releases/X2GoClient_latest_mswin32-setup.exe or http://code.x2go.org/releases/PyHoca-GUI_latest_mswin32-setup.exe
   - Update link on home page http://wiki.x2go.org/doku.php
   - Update BOTH links here http://wiki.x2go.org/doku.php/doc:installation:x2goclient or here http://wiki.x2go.org/doku.php/doc:installation:pyhoca-gui?&#ms_windows
   - Windows-Specific release notes http://wiki.x2go.org/doku.php/doc:release-notes-mswin
   - Release email

X2Go - everywhere@home

User Tools

Site Tools

Differences

Page Tools