Changes between Version 18 and Version 19 of KDEProblems/KDEMacPortsCI/Status

Timestamp:

May 24, 2014, 7:27:30 AM (10 years ago)

Author:

mkae (Marko Käning)

Comment:

build environment update section

KDEProblems/KDEMacPortsCI/Status

@@ -127 +127 @@
 $ python2.7 tools/perform-build.py --project cmake --branchGroup kf5-qt5 --platform darwin-mavericks --sources ~/WC/KDECI-build/cmake
 ...
+}}}
+
+
+
+== Keeping build environment up-to-date ==
+
+In order to always have the latest KDE/CI running it makes sense to temporally stash away the changes made locally and upgrade via git
+{{{
+$ # Check what has changed locally:
+$ git diff
+diff --git a/config/build/darwin-mavericks.cfg b/config/build/darwin-mavericks.cfg
+index cb62c49..0648464 100644
+--- a/config/build/darwin-mavericks.cfg
++++ b/config/build/darwin-mavericks.cfg
+@@ -1,7 +1,8 @@
+ [DEFAULT]
++scriptsLocation=/Users/kdeci/scripts
+ opSys=darwin
+ architecture=mavericks
+ compiler=clang
+ 
+ [General]
+-installPrefix=/opt/kde/install/%(opSys)s/%(architecture)s/%(compiler)s/
+\ No newline at end of file
++installPrefix=/opt/kde/install/%(opSys)s/%(architecture)s/%(compiler)s/
+$ 
+$ git status
+On branch production
+Your branch is up-to-date with 'origin/production'.
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git checkout -- <file>..." to discard changes in working directory)
+
+        modified:   config/build/darwin-mavericks.cfg
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+        build.sh
+        dependencies/
+        kapidox/
+        kde_projects.xml
+        poppler-test-data/
+        prepare.sh
+
+no changes added to commit (use "git add" and/or "git commit -a")
+$
+$ # Updating CI scripts
+$ cd ~/scripts; git stash; git pull; git stash pop
 }}}