Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
6126 commits 10 branches 0 tags 41 MiB
Commit graph

113 commits

Author SHA1 Message Date
Enno Rehling
e23a7fc87d deprecate report_kampfstatus and implement a replacement function. 2015-10-27 12:40:04 +01:00
Enno Rehling
47c48d2985 Merge branch 'master' into develop 2015-09-12 22:27:14 +02:00
Enno Rehling
7e6312441c cron fixes 2015-09-12 21:43:36 +02:00
Enno Rehling
de9fec8eed fix bug in a python script 
do not install crontab anywhere but eressea@gruenbaer
 2015-09-12 21:21:58 +02:00
Enno Rehling
8f00d5293f change the release naming scheme 2015-09-12 15:42:46 +02:00
Enno Rehling
864454877e change the release naming scheme 2015-09-12 15:42:03 +02:00
Enno Rehling
6c8342d1c1 Merge branch 'master' into develop 2015-09-12 15:39:58 +02:00
Enno Rehling
17342b7c5d add a release-tagging script 2015-09-12 15:39:36 +02:00
Enno Rehling
3f39569710 add compression scripts to installer 2015-09-12 15:26:00 +02:00
Enno Rehling
42f1030251 separate test script for E4: 
even though it has mostly the same rules, it does not have xmastrees, and loads a different config
remove dead `inactivefaction` function, we have no use for the file it creates.
 2015-09-12 14:10:08 +02:00
Enno Rehling
bf86b1d66a add missing .sh files to git (previously blocked by .gitignore) 
add an integration test for run-turn.lua
 2015-09-07 15:27:30 +02:00
Enno Rehling
a28a35bb6c include weekly summary in the report email. 
https://bugs.eressea.de/view.php?id=2135#c6115
 2015-09-07 11:04:56 +02:00
Enno Rehling
df5eaa6ef2 eliminate warning (unused variable) 2015-08-16 19:55:11 +02:00
Enno Rehling
76740192f8 check that the CR contains reasonable entries 2015-08-05 17:42:36 +02:00
Enno Rehling
a31dd95de0 give the first unit a sword, set skills from the equipment-config, not script 
make the preview link use a soft-link, not calculate the build-directory again.
 2015-07-19 20:07:08 +02:00
Enno Rehling
c0c3400f21 remove junk files, thank you windows 2015-07-12 11:01:59 +02:00
Enno Rehling
7087c0e0ab Update to latest submodules, fix iniparser and critbit. 
I did this before, must have lost it in the merge. Crazy.
 2015-07-12 10:38:01 +02:00
Enno Rehling
11e1fab0d0 Merge branch 'hotfix-3.4.1' into feature/travis-migration 
Conflicts:
	.travis.yml
	s/build
	s/cmake-init
	s/runtests
	s/travis-build
	src/kernel/region.c
 2015-07-12 04:12:32 +02:00
Enno Rehling
cfb1812f24 fix building on RasPi 2015-07-12 03:08:29 +02:00
Enno Rehling
b89c9a2401 raspberry pi fixes 2015-07-12 01:04:39 +02:00
Enno Rehling
252d8b8d88 trying to fix tolua build 2015-07-11 23:25:09 +02:00
Enno Rehling
90d428f67a use local copy of tolua if it isn't installed in the system 2015-07-11 21:52:59 +02:00
Enno Rehling
4c79962729 add tolua submodule, kill all references to tolua++ 2015-07-11 17:48:35 +02:00
Enno Rehling
13e50cd403 updte submoduiles before building 2015-07-11 14:37:38 +02:00
Enno Rehling
09db2fe278 jsreport: return error if file not open. add scan-build to travis 2015-07-06 20:49:13 +02:00
Enno Rehling
7934917607 pull latest version before building develop 2015-06-28 13:38:13 +02:00
Enno Rehling
b630c9ee45 oops. the name of the server is gruenbaer, not eressea 2015-06-17 08:07:47 +02:00
Enno Rehling
5257848648 do not install crontab, except on eresseaserver. fixes issue #226 2015-06-17 08:06:01 +02:00
Enno Rehling
32bd8c4353 make preview script valgrind use suppression file, closing issue #154 2015-06-17 07:50:35 +02:00
Enno Rehling
ff3fdb62cd enable valgrind suppressions for QA previews 2015-06-17 07:30:06 +02:00
Enno Rehling
8080adcd2b travis build now runs a full turn for acceptance. 
* new cmake module (lus/tolua changes).
* valgrind suppression for glibc strtod problems.
 2015-06-09 08:39:22 +02:00
Enno Rehling
8ecf51b057 cmake will use LD_LUA and LD_TOLUA environment variables to search 2015-06-08 22:23:07 +02:00
Enno Rehling
59400b1e27 Merge branch 'release-3-5' into develop 
Conflicts:
	s/runtests
	src/buildno.h
 2015-05-24 14:10:42 +02:00
Enno Rehling
9780ec845f still having problems with GiveRestriction 2015-05-24 07:49:01 +02:00
Enno Rehling
b7f6bea569 suppress zlib bugs on Travix boxen 2015-05-21 18:03:24 +02:00
Enno Rehling
0838218706 generate suppressions, fix valgrind exit code 2015-05-21 17:48:45 +02:00
Enno Rehling
090197866b investigating travis build environment 2015-05-21 17:44:36 +02:00
Enno Rehling
ac01d33cd2 try to locate zlib valgrind problem on the travis boxen. 
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=577135
use set -e to terminate when any part of the build fails
 2015-05-21 17:29:13 +02:00
Enno Rehling
f29d573c3e fix travis build writing reports with valgrind 2015-05-21 16:30:14 +02:00
Enno Rehling
5c62bf2401 include valgrind in the travis build 2015-05-21 13:21:53 +02:00
Enno Rehling
1c4778e3ef abort tests when non-zero exit-code is returned, fix GiveRestriction for pool tests 2015-05-21 11:05:24 +02:00
Enno Rehling
88f454e1f7 failed tests abort runtests and return an error code 
small test world for (future) valgrind tests.
 2015-05-21 08:29:22 +02:00
Enno Rehling
57263134ab travis build did not run the right test file 2015-05-18 07:36:39 +02:00
Enno Rehling
c57907e340 setup new games defaulting to turn 0 2015-05-12 14:30:49 -07:00
Enno Rehling
dc0897b122 fix gmtool and setup script to match the GM guide document. 2015-05-10 13:41:48 -07:00
Enno Rehling
7ae7fa24d8 don't call nproc if the system doesn't have it 2015-03-03 00:10:10 +01:00
Enno Rehling
45b77c9993 Merge branch 'repairing_lua_tests' of https://github.com/CTD1/eressea-server-bugfixing into CTD1-repairing_lua_tests 
Conflicts:
	scripts/run-tests.lua
 2015-02-20 20:28:36 +01:00
CTD
8f21aa7a11 repairing lua tests 
Das ist totales Chaos, viele Testcases wurden einfach nicht ausgeführt
weil sie nicht in den init files stehen.
Etwas neu strukturiert, Test laufen jetzt auch wenn sie nicht aus dem
eressea root Ordner gestartet werden wie in s/runtest und es sind einige
Testcases mehr als bisher. Auch macht Travis jetzt die E3 Test. Dabei
ist ein schwerwiegender Fehler beim neuen Bewache aufgefallen!
 2015-02-13 16:03:05 +01:00
Enno Rehling
742f464ee5 further fixes to the crontab system 2015-02-08 10:35:59 +01:00
Enno Rehling
741cb30e90 clean up cron jobs, add crontab, add flag to disable jobs 2015-02-07 19:39:44 +01:00