Differences

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

--- wiki:development:release-howto-mswin [2016/09/20 22:24]
mikedep333 ver-mswin -> release/ver-mswin We've been doing this for a while.
+++ wiki:development:release-howto-mswin [2016/09/20 22:36]
mikedep333 Steps for build-main-mswin branch
@@ Line 8: / Line 8: @@
 | ''<ver>'' | Existing released version. For example, 4.0.3.2  |
 | ''<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 34: / Line 34: @@
 |  3  | <code bash>git commit -am 'release <ver>'</code> | |
 |  4  | <code bash>git push</code> | |
+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.
@@ 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://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:pyhoca-gui
@@ Line 50: / 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 |

X2Go - everywhere@home

User Tools

Site Tools

Differences

Page Tools