Merge lp:~widelands-dev/widelands/bug-1806901_use_compile_sh_in_update_sh into lp:widelands

Proposed by kaputtnik
Status: Merged
Merged at revision: 8946
Proposed branch: lp:~widelands-dev/widelands/bug-1806901_use_compile_sh_in_update_sh
Merge into: lp:widelands
Diff against target: 27 lines (+3/-7)
1 file modified
compile.sh (+3/-7)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1806901_use_compile_sh_in_update_sh
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+360494@code.launchpad.net

Commit message

Use compile.sh when running update.sh

Description of the change

Call compile.sh from update.sh to prevent maintaining two compile logics.

Here it runs fine, but has to be tested on mac.

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

LGTM :)

@bunnybot merge

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4324. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/467357427.
Appveyor build 4119. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1806901_use_compile_sh_in_update_sh-4119.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4324. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/467357427.

8940. By kaputtnik

merged trunk

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4355. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/470910004.
Appveyor build 4149. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1806901_use_compile_sh_in_update_sh-4149.

Revision history for this message
kaputtnik (franku) wrote :

lets force the merge

@bunnybot merge force

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compile.sh'
2--- compile.sh 2018-11-09 06:43:43 +0000
3+++ compile.sh 2018-12-21 09:26:46 +0000
4@@ -75,6 +75,8 @@
5 }
6
7
8+## Get command and options to use in update.sh
9+COMMANDLINE="$0 $@"
10
11 ## Options to control the build.
12 BUILD_WEBSITE="ON"
13@@ -294,13 +296,7 @@
14 fi
15
16 bzr pull
17-cd build
18-$buildtool
19-rm ../VERSION || true
20-rm ../widelands || true
21-cp VERSION ../VERSION
22-mv src/widelands ../widelands
23-cd ..
24+$COMMANDLINE
25
26 echo " "
27 echo "################################################"

Subscribers

People subscribed via source and target branches

to status/vote changes: