Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
9afadccefa
Fix duplicates being added to .travis.yml & debain-template/control
2020-08-09 21:32:55 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Sally Coolatta
7aa398aede
Merge .travis.yml
2020-08-09 20:48:55 -04:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Sryder
ba706e8409
Use xenial to build all the versions newer than trusty
...
I'm not 100% sure why we can't use newer series to build the newer installers. But this seems to be what vanilla does
2020-05-19 20:45:49 +01:00
Sryder
4eb7540cb3
Use bionic to build focal version because it has GCC 4.8?
2020-05-16 00:02:33 +01:00
Sryder
c646d4d8d0
Remove now unsupported distros from deployer
...
Add new supported distros to deployer
2020-05-14 13:16:49 +01:00
Steel Titanium
97ba63424f
Support for http downloads
...
(cherry picked from commit 5e0eca9fe9 )
(cherry picked just the libcurl stuff)
2020-05-13 17:25:52 -07:00
Steel Titanium
5e0eca9fe9
Support for http downloads
2020-04-07 18:22:29 -04:00
mazmazz
914d6ef5a9
Travis Deployer: Use xenial instead of bionic for building installers
...
Bionic breaks package signing because importing the private key is unsuccessful. Works in xenial. The buildbot distro doesn't matter because we're just sending source packages to Launchpad which builds on the target distro.
2019-12-07 15:58:59 -05:00
mazmazz
3128fe6b2a
Travis Linux Deployer fixes
2019-12-07 15:14:33 -05:00
Steel Titanium
8e5593c207
Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt
...
# Conflicts:
# .travis.yml
# src/m_menu.c
# src/sdl/Srb2SDL-vc10.vcxproj
# src/sdl/Srb2SDL.props
2019-06-11 17:48:00 -04:00
Steel Titanium
8d5207975d
Merge branch 'master' into travis-deployer
...
# Conflicts:
# .travis.yml
2019-06-07 16:56:19 -04:00
James R
88ba895d18
Fix GCC 8 Travis error
2019-05-28 19:00:24 -07:00
Steel Titanium
5e6a778f84
Add missing PPA source
2019-05-25 16:20:16 -04:00
Steel Titanium
3cb6a81be8
Properly close the if
2019-05-20 22:17:38 -04:00
Steel Titanium
46606aa351
Move to before_install
2019-05-20 22:00:28 -04:00
Steel Titanium
2c8adcf0eb
travis: remove sudo from command
2019-05-20 21:56:43 -04:00
Steel Titanium
2d6116fa33
travis: Add gpg key for git-lfs on linux
2019-05-20 21:54:29 -04:00
Steel Titanium
2ede6dd29f
Merge branch 'master' into public-musicplus-libopenmpt
2019-05-20 21:33:10 -04:00
Alam Arias
783f910d65
TravisCI: remove xcode7.3 on DPL mac build
2019-03-26 21:20:17 -04:00
Alam Arias
fea79d2185
mistype in merge of TavisCI config
2019-03-26 11:54:54 -04:00
Alam Arias
85b79ae822
Merge commit 'upstream/master~0'
2019-03-26 10:50:36 -04:00
Alam Ed Arias
e8a527b6dc
TravisCI: use stock sdl2_mixer for prebuild bottle
2019-03-25 16:59:47 -04:00
Alam Ed Arias
05d2dcca97
travisCI: add sdl2_mixer from mazmazz's srb2 tap
2019-03-25 16:43:33 -04:00
Alam Ed Arias
208a835479
TravisCI: install deps on sdl2_mixer
2019-03-25 16:30:02 -04:00
Alam Ed Arias
15dbe3730b
TravisCI: try updating homebew
2019-03-25 16:02:30 -04:00
Alam Ed Arias
e47bf6274f
TravisCI: build custom sdl2_mixer build
2019-03-25 15:51:13 -04:00
Alam Ed Arias
d69d834c6a
use default osx image
2019-03-25 15:48:33 -04:00
Alam Ed Arias
45c641204b
TravisCI: move homebrew packages for all mac builds
2019-03-25 15:44:33 -04:00
Alam Ed Arias
853855eb69
Travis-CI: use a new version of xcode and use homebrew add-on to install packages
2019-03-25 15:16:43 -04:00
Alam Arias
fd7f09b124
Merge remote-tracking branch 'upstream/master'
2019-03-09 20:38:36 -05:00
Alam Ed Arias
a2c1b63864
partly Revert "TravisCI: remove WFLAGS"
...
This reverts commit a22c9a999e .
2019-03-09 20:36:44 -05:00
Alam Ed Arias
a22c9a999e
TravisCI: remove WFLAGS
2019-03-09 20:17:14 -05:00
Alam Arias
afaa620f6b
Merge remote-tracking branch 'upstream/master'
2019-03-09 20:13:41 -05:00
Alam Ed Arias
d386febf56
TravisCI: add option for GCC 8.1
2019-03-09 19:41:56 -05:00
Marco Z
74c57ad447
Kart Public Next merge
2019-01-08 18:43:49 -05:00
mazmazz
2a447f8800
Remove unnecessary version info call
2019-01-05 19:56:52 -05:00
mazmazz
5db9b3082f
Remove unnecessary version info call
2019-01-05 19:56:27 -05:00
mazmazz
0a40c19f7a
Remove zlib from release brew packages
...
(it was never in the original travis script)
2019-01-05 19:50:46 -05:00
mazmazz
da0add55b0
Use standard OSX brew bottles to speed up test buildbots
2019-01-05 19:50:27 -05:00
mazmazz
4ba352e590
Remove zlib from release brew packages
...
(it was never in the original travis script)
2019-01-05 19:49:25 -05:00
mazmazz
51ad724513
Use standard OSX brew bottles to speed up test buildbots
2019-01-05 19:43:37 -05:00
mazmazz
43fa1f0ee1
OS X set CFLAGS+="-march=core2" for compatible binaries with old Macs
2019-01-05 19:34:39 -05:00
mazmazz
8d86c537e0
OS X set CFLAGS+="-march=core2" for compatible binaries with old Macs
2019-01-05 19:33:58 -05:00
mazmazz
3e52eb1de5
* Add homebrew tap mazmazz/srb2
...
* Use sdl2_mixer from mazmazz/srb2 due to removed options from homebrew-core
* Use `brew install --build-bottle` to build compatible libraries for old Macs
2019-01-05 19:30:58 -05:00
mazmazz
c88299a81b
Don't terminate in after_success because it halts the log abruptly
2019-01-05 19:30:57 -05:00
mazmazz
6da562f72f
Revised comments
2019-01-05 19:30:54 -05:00
mazmazz
342e7768f5
* Add homebrew tap mazmazz/srb2
...
* Use sdl2_mixer from mazmazz/srb2 due to removed options from homebrew-core
* Use `brew install --build-bottle` to build compatible libraries for old Macs
2019-01-05 19:20:58 -05:00