Commit Graph

100 Commits

Author SHA1 Message Date
Martin Diehl 718f3841f8 Merge branch 'cmake' into development 2017-04-19 21:48:50 +02:00
Martin Diehl b2897210f9 source DAMASK_env.sh was missing 2017-04-19 10:50:07 +02:00
Martin Diehl cbaec8bcb9 was in wrong directory 2017-04-19 09:35:19 +02:00
Martin Diehl f0f602e1f5 confused merging strategies 2017-04-18 15:18:23 +02:00
Martin Diehl 2c28d059b5 Merge branch 'development' into PRIVATEasSubmodule 2017-04-18 05:42:27 +02:00
Martin Diehl 1768d8f103 update of VERSION file should not trigger new GitLabCI 2017-04-18 05:37:36 +02:00
Martin Diehl 32722a3d77 adopting to new installation and test 2017-04-18 05:29:00 +02:00
Martin Diehl c58dd6279d Merge branch 'development' into PRIVATEasSubmodule 2017-04-17 05:51:04 +02:00
Martin Diehl de48d54201 conflict occured after manual merge+push to master 2017-04-17 05:50:41 +02:00
Martin Diehl a52010dff2 error during merge 2017-04-15 12:58:13 +02:00
Martin Diehl 8bee117401 corrected path 2017-04-15 12:55:13 +02:00
Martin Diehl 1344905c7e typo 2017-04-15 12:45:11 +02:00
Martin Diehl 65985e3dd7 correct escape 2017-04-15 12:44:02 +02:00
Martin Diehl d2b6fdd453 corrected path 2017-04-15 12:33:52 +02:00
Martin Diehl cb4a1a0f81 Merge branch 'development' into PRIVATEasSubmodule 2017-04-15 12:27:13 +02:00
Martin Diehl 62dd57313e queue for runners to retain order 2017-04-15 12:07:59 +02:00
Martin Diehl a46107ba7f pull needed to avoid conflicts 2017-04-14 09:16:21 +02:00
Martin Diehl ae3a5187c0 syntax error 2017-04-13 21:35:46 +02:00
Martin Diehl a2bbf1faaf Merge branch 'development' into PRIVATEasSubmodule 2017-04-13 19:59:33 +02:00
Martin Diehl 45f192be09 safe in case of failing prepareAll 2017-04-13 19:56:52 +02:00
Martin Diehl 67d9fb386b in-line code for better readability 2017-04-13 19:42:59 +02:00
Martin Diehl b5275ad7b9 adjusted handling of PRIVATE for testing 2017-04-13 16:24:55 +02:00
Martin Diehl e5eea4caec finished debugging, master and release will never be tested 2017-04-13 16:12:48 +02:00
Martin Diehl bf7b4f2af5 debugging update procedure2 2017-04-13 13:21:38 +02:00
Martin Diehl f1c6524c34 debugging update procedure 2017-04-13 13:07:38 +02:00
Martin Diehl 97d19320ce fixed .zsh script as well, checking out PRIVATE repo again 2017-04-13 08:20:30 +02:00
Martin Diehl 11a3d9c333 error in DAMASK_env.sh seems to be the reason 2017-04-13 08:15:01 +02:00
Martin Diehl 50b3523927 reverting 2017-04-13 08:11:40 +02:00
Martin Diehl 92ce58bcf1 trying non-NFS location 2017-04-13 08:09:07 +02:00
Martin Diehl 6d82566920 working around source statement 2017-04-13 07:55:37 +02:00
Martin Diehl 8f08c2e843 working around cd2 2017-04-13 07:50:53 +02:00
Martin Diehl 4d80f7f8ac working around cd 2017-04-13 07:43:36 +02:00
Martin Diehl 1b71b098d4 debugging source statement2 2017-04-13 07:35:21 +02:00
Martin Diehl 75c3fff355 debugging source statement1 2017-04-13 07:31:57 +02:00
Martin Diehl 043d96f902 debugging source statement 2017-04-13 07:23:27 +02:00
Martin Diehl f759dd0204 debugging source1 2017-04-13 07:20:56 +02:00
Martin Diehl 39732f0ad1 debugging source 2017-04-13 07:17:57 +02:00
Martin Diehl 53ba9f2497 still failing 2017-04-13 00:14:15 +02:00
Martin Diehl 50eac33181 still failing 2017-04-13 00:00:11 +02:00
Martin Diehl 6039c51910 fixing path 2017-04-12 23:54:42 +02:00
Martin Diehl e7f8e57221 absolute path not working 2017-04-12 23:51:02 +02:00
Martin Diehl 5a1f907903 wrong arguments 2017-04-12 23:38:44 +02:00
Martin Diehl 75a00d53e7 COMMIT_SHA was not set 2017-04-12 23:36:04 +02:00
Martin Diehl 4bcefa992b trying to avoid conflicts when updating master and development, only one pipeline at the same time 2017-04-12 23:30:33 +02:00
Martin Diehl f166ba4c9a do long example runs only for development 2017-04-12 16:47:32 +02:00
Martin Diehl 3fc5d8c5f9 set home in Gitlab settings 2017-04-12 14:38:23 +02:00
Martin Diehl b1ffe883be directory was not parameterized 2017-04-12 14:28:42 +02:00
Martin Diehl 69d4e51ce0 typo 2017-04-12 13:22:46 +02:00
Martin Diehl 29cabe1df2 /home/m is not defined 2017-04-12 13:19:36 +02:00
Martin Diehl 086fffc1b4 using gitlab CI 2017-04-12 13:16:27 +02:00