The proposal to merge
lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986
--
Your team Widelands
OK, the merge was a bit premature:
Revision detection is not broken, but does not happen any longer...
--
https://code.launchpad.net/~widelands-dev/widelands/remove_duplicate_code/+merge/355586
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/remove_duplicate_cod
Review: Approve testplay on windows
OK, tested along the original Bug, works as desigend.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1746270-rolling-autosave-file-permissions/+merge/353758
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/w
I tested this on Linux and got a correct version detection - maybe it's a
Windows issue?
--
https://code.launchpad.net/~widelands-dev/widelands/remove_duplicate_code/+merge/355586
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/remove_duplicate_code.
_
The proposal to merge
lp:~widelands-dev/widelands/bug-1746270-rolling-autosave-file-permissions into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1746270-rolling-autosave-file-permissions/+merge/
Um, the compile script no longer works for me on linux in trunk-8854?
[…]
-- Not using AddressSanitizer.
-- Version of Widelands Build is (Release)
CMake Warning (dev) at /usr/share/cmake-3.10/Modules/CTest.cmake:234 (if):
Policy CMP0054 is not set: Only interpret if() arguments as variables or
Continuous integration builds have changed state:
Travis build 4045. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/433322473.
Appveyor build 3841. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_179142
The version isn't shown on macOS either:
The "RESULT_VARIABLE" says: No such file or directory
So the command does not seem to be executed and therefore WL_Version is empty.
--
https://code.launchpad.net/~widelands-dev/widelands/remove_duplicate_code/+merge/355586
Your team Widelands Developers
Sorry for the spam. This line needs to be removed:
WORKING_DIRECTORY ${MAKE_CURRENT_SOURCE_DIR}
--
https://code.launchpad.net/~widelands-dev/widelands/remove_duplicate_code/+merge/355586
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/remove_duplicate_code.
The cmake warning is caused by Tino's "Quickfix" at revision 8853 in trunk.
These lines in BzrRevision.cmake trigger it the policy:
string(REGEX REPLACE "\n|\r$" "" WL_VERSION "${WL_VERSION}")
string(STRIP WL_VERSION "${WL_VERSION}")
file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/VERSION "${WL_VERSION}"
Continuous integration builds have changed state:
Travis build 4046. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/433324366.
Appveyor build 3842. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_gunchleoc_widelands_translation_va
The proposal to merge
lp:~gunchleoc/widelands/translation_validation_folder_structure into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~gunchleoc/widelands/translation_validation_folder_structure/+merge/355599
--
Your team
Mhh, why can you remove that code and fix it via that other code?
I must take a complete look at this logic.
I will not try to use this replay, but try to reproduce it,
which will become quite tricky.
Any tips how I can provoke this fast and easy?
One nit inline.
Diff comments:
> === modified
Just 1 nit.
Diff comments:
>
> === modified file
> 'data/tribes/scripting/starting_conditions/barbarians/village.lua'
> --- data/tribes/scripting/starting_conditions/barbarians/village.lua
> 2017-11-21 09:26:16 +
> +++ data/tribes/scripting/starting_conditions/barbarians/village.lua
> 2
Toni Förster has proposed merging
lp:~widelands-dev/widelands/cmake_errors_WL_VERSION into lp:widelands.
Commit message:
explicitly set CMP0054 to fix warning
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/cma
Review: Approve
Tested it; and it works as advertised.
--
https://code.launchpad.net/~widelands-dev/widelands/soldier-capacity-ctrl/+merge/355002
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/soldier-capacity-ctrl.
___
>From what I understand, the test suite forces the removal of ports and ships
>without running clean-up code. That invalidates the state of transports and
>breaks the advanced logic. I'm not sure if it is worthy to change the logic,
>instead of changing the tests.
--
https://code.launchpad.net/
Continuous integration builds have changed state:
Travis build 4052. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/433622680.
Appveyor build 3848. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_858292
Continuous integration builds have changed state:
Travis build 4053. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/433707130.
Appveyor build 3849. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_cmake_erro
I am not a big fan of silencing warnings and do not see this warning on both
Appveyor and Travis or my system (cmake 3.11.1).
--
https://code.launchpad.net/~widelands-dev/widelands/cmake_errors_WL_VERSION/+merge/355728
Your team Widelands Developers is requested to review the proposed merge of
Mhh, don understand that (single) failure on travis:
CMake Error at
/usr/local/cmake-3.9.2/share/cmake-3.9/Modules/CMakeDetermineCCompiler.cmake:48
(message):
Could not find compiler set in environment variable CC:
--
https://code.launchpad.net/~widelands-dev/widelands/bug-858292-military-inf
21 matches
Mail list logo
