upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-26 12:52:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,121 Commits 56 Branches 373 Tags
Commit Graph

16 Commits

Author SHA1 Message Date
pentarctagon
9c2eb0fcb9 Re-add libsdl2-ttf to dockerfile. 2018-10-14 19:05:45 -05:00
pentarctagon
68db6956d2 Revert "Update branch name: master -> development" 
This reverts commit 6cf9d04de5a41dd49731103b8ad6bf55c2ee6dbf.
 2018-10-14 18:59:18 -05:00
josteph
6cf9d04de5 Update branch name: master -> development 
Based on:
ba68d52aa135fff6d279e1486a70b6a1952fefa7
ef8fc9df939f8875d8c69ef41619c40a1287a352
ae332bf8b1a810ce255ee5207008f564371254ed
in the 1.14 branch.
 2018-10-14 16:36:26 +00:00
pentarctagon
da4d4a1be6 Adds lld to the 1804 docker image. 
The gold linker is available already, but lld is not installed along with clang.

(cherry-picked from commit 2aed8af606b00a2e989991b604037a816675ce4a)
 2018-10-07 03:19:55 +00:00
pentarctagon
c07b8ca798 Enable building with mysql support on travis. 
(cherry-picked from commit 4157251f11a5669c64a3941462615dad0da65c96)
 2018-10-07 03:19:36 +00:00
pentarctagon
44c8034177 Re-add boost-thread. 
Also add in opengl packages while I'm at it.

(cherry-picked from commit 135921ad10334ccf890dd10b7f086bc98597b9eb)
 2018-10-07 03:19:30 +00:00
pentarctagon
a0adab3fcc Adds a c++17 build using the pre-release Ubuntu 18.04. 
Though given 00d87f8fe4078ffd84fcdc0d73fcc2104efef1e7 I would say this is better than nothing.

(cherry-picked from commit 33ad6be326c234b173d680ce34589464f88f8418)
 2018-10-07 03:19:24 +00:00
pentarctagon
34a18a7692 Remove boost-thread from dockerfile. 
(cherry-picked from commit 52f8e8233c99c214d7409fd9f0b2cd4056590255)
 2018-10-07 03:19:12 +00:00
pentarctagon
f4c221216b Create travis dockerfile in the travis script step. 
This allows having multiple Dockerfile-base-* files without also needing to add a separate Dockerfile-travis-* file due to the FROM line changing.

(cherry-picked from commit 3f67c2fbf051aa9e322defb66c782477cd53b8bd)
 2018-10-07 03:18:45 +00:00
pentarctagon
dcf2767a14 Add using dockerfiles based on the LTS and BRANCH env vars 
This makes it simpler in the future to have branches that have dependencies that are different from master, rather than having a single image with all necessary dependencies installed, which may at some point end up not being possible to do.

(cherry-picked from commit 1bb5fdf2830515d33793c52f298d305bd12b5a60)
 2018-10-07 03:18:37 +00:00
Charles Dang
471c9e876a Addressed a large chunk of the whitespace issues from #2613 
[ci skip]
 2018-03-09 11:37:00 +11:00
pentarctagon
c2bc40fbf9 Add ccache to the base dockerfile. 
Also organized what's being installed a bit.
 2018-02-17 03:16:32 -06:00
pentarctagon
ee1a56a04a Use ccache with cmake on travis. 
This replaces the custom python script which manipulated various files' mtime with ccache for allowing cmake builds to not need full recompiles every travis run.
 2018-02-17 03:16:32 -06:00
pentarctagon
cbc14f553b Add python3 package to the base docker image. 2018-02-12 10:47:42 +11:00
pentarctagon
acc0b6a1f1 Implement workaround for cmake using mtime to determine what to rebuild. 2018-02-12 10:47:42 +11:00
pentarctagon
10ca22e863 Use Docker Hub to get an image with pre-installed dependencies. 2017-12-01 21:04:05 -06:00