| 129 | }}} |
| 130 | |
| 131 | |
| 132 | |
| 133 | == Keeping build environment up-to-date == |
| 134 | |
| 135 | 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 |
| 136 | {{{ |
| 137 | $ # Check what has changed locally: |
| 138 | $ git diff |
| 139 | diff --git a/config/build/darwin-mavericks.cfg b/config/build/darwin-mavericks.cfg |
| 140 | index cb62c49..0648464 100644 |
| 141 | --- a/config/build/darwin-mavericks.cfg |
| 142 | +++ b/config/build/darwin-mavericks.cfg |
| 143 | @@ -1,7 +1,8 @@ |
| 144 | [DEFAULT] |
| 145 | +scriptsLocation=/Users/kdeci/scripts |
| 146 | opSys=darwin |
| 147 | architecture=mavericks |
| 148 | compiler=clang |
| 149 | |
| 150 | [General] |
| 151 | -installPrefix=/opt/kde/install/%(opSys)s/%(architecture)s/%(compiler)s/ |
| 152 | \ No newline at end of file |
| 153 | +installPrefix=/opt/kde/install/%(opSys)s/%(architecture)s/%(compiler)s/ |
| 154 | $ |
| 155 | $ git status |
| 156 | On branch production |
| 157 | Your branch is up-to-date with 'origin/production'. |
| 158 | |
| 159 | Changes not staged for commit: |
| 160 | (use "git add <file>..." to update what will be committed) |
| 161 | (use "git checkout -- <file>..." to discard changes in working directory) |
| 162 | |
| 163 | modified: config/build/darwin-mavericks.cfg |
| 164 | |
| 165 | Untracked files: |
| 166 | (use "git add <file>..." to include in what will be committed) |
| 167 | |
| 168 | build.sh |
| 169 | dependencies/ |
| 170 | kapidox/ |
| 171 | kde_projects.xml |
| 172 | poppler-test-data/ |
| 173 | prepare.sh |
| 174 | |
| 175 | no changes added to commit (use "git add" and/or "git commit -a") |
| 176 | $ |
| 177 | $ # Updating CI scripts |
| 178 | $ cd ~/scripts; git stash; git pull; git stash pop |