8000 Merge pull request #92 from fancycode/ci-xenial · fancycode/MemoryModule@5f83e41 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5f83e41

Browse files
fancycodefancycode
authored
Merge pull request #92 from fancycode/ci-xenial
CI: Upgrade to Ubuntu Xenial and use latest wine-stable
2 parents d1a0824 + 316aa59 commit 5f83e41

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

‎.travis.yml

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,47 @@ sudo: true
22

33
matrix:
44
include:
5-
- env: PLATFORM=x86_64 UNICODE= CMAKE=
5+
- env: PLATFORM=x86_64 UNICODE= CMAKE= WINE_PACKAGE=winehq-stable:amd64
66
addons:
77
apt:
88
packages:
99
- binutils-mingw-w64-x86-64
1010
- mingw-w64-x86-64-dev
1111
- g++-mingw-w64-x86-64
1212
- gcc-mingw-w64-x86-64
13-
- wine:amd64
14-
- env: PLATFORM=i686 UNICODE= CMAKE=
13+
- env: PLATFORM=i686 UNICODE= CMAKE= WINE_PACKAGE=winehq-stable:i386
1514
addons:
< 10000 /code>
1615
apt:
1716
packages:
1817
- binutils-mingw-w64-i686
1918
- mingw-w64-i686-dev
2019
- g++-mingw-w64-i686
2120
- gcc-mingw-w64-i686
22-
- wine:i386
23-
- env: PLATFORM=x86_64 UNICODE=1 CMAKE=
21+
- env: PLATFORM=x86_64 UNICODE=1 CMAKE= WINE_PACKAGE=winehq-stable:amd64
2422
addons:
2523
apt:
2624
packages:
2725
- binutils-mingw-w64-x86-64
2826
- mingw-w64-x86-64-dev
2927
- g++-mingw-w64-x86-64
3028
- gcc-mingw-w64-x86-64
31-
- wine:amd64
32-
- env: PLATFORM=i686 UNICODE=1 CMAKE=
29+
- env: PLATFORM=i686 UNICODE=1 CMAKE= WINE_PACKAGE=winehq-stable:i386
3330
addons:
3431
apt:
3532
packages:
3633
- binutils-mingw-w64-i686
3734
- mingw-w64-i686-dev
3835
- g++-mingw-w64-i686
3936
- gcc-mingw-w64-i686
40-
- wine:i386
41-
- env: PLATFORM=x86_64 UNICODE= CMAKE=1
37+
- env: PLATFORM=x86_64 UNICODE= CMAKE=1 WINE_PACKAGE=winehq-stable:amd64
4238
addons:
4339
apt:
4440
packages:
4541
- binutils-mingw-w64-x86-64
4642
- mingw-w64-x86-64-dev
4743
- g++-mingw-w64-x86-64
4844
- gcc-mingw-w64-x86-64
49-
- wine:amd64
50-
- env: PLATFORM=i686 UNICODE= CMAKE=1
45+
- env: PLATFORM=i686 UNICODE= CMAKE=1 WINE_PACKAGE=winehq-stable:i386
5146
addons:
5247
apt:
5348
packages:
@@ -56,8 +51,7 @@ matrix:
5651
- mingw-w64-i686-dev
5752
- g++-mingw-w64-i686
5853
- gcc-mingw-w64-i686
59-
- wine:i386
60-
- env: PLATFORM=x86_64 UNICODE=1 CMAKE=1
54+
- env: PLATFORM=x86_64 UNICODE=1 CMAKE=1 WINE_PACKAGE=winehq-stable:amd64
6155
addons:
6256
apt:
6357
packages:
@@ -66,8 +60,7 @@ matrix:
6660
- mingw-w64-x86-64-dev
6761
- g++-mingw-w64-x86-64
6862
- gcc-mingw-w64-x86-64
69-
- wine:amd64
70-
- env: PLATFORM=i686 UNICODE=1 CMAKE=1
63+
- env: PLATFORM=i686 UNICODE=1 CMAKE=1 WINE_PACKAGE=winehq-stable:i386
7164
addons:
7265
apt:
7366
packages:
@@ -76,15 +69,19 @@ matrix:
7669
- mingw-w64-i686-dev
7770
- g++-mingw-w64-i686
7871
- gcc-mingw-w64-i686
79-
- wine:i386
8072

8173
language: cpp
8274

75+
dist: xenial
76+
8377
cache:
8478
- apt
8579
- ccache
8680

8781
before_script:
82+
- curl https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
83+
- echo "deb https://dl.winehq.org/wine-builds/ubuntu/ xenial main" | sudo tee /etc/apt/sources.list.d/winehq.list
84+
- sudo apt-get -y update && sudo apt-get -y install --install-recommends $WINE_PACKAGE
8885
- if [ ! -z "$CMAKE" ]; then cmake -DPLATFORM=$PLATFORM -DUNICODE=$UNICODE -DTESTSUITE=ON -H. -B.; fi
8986

9087
script:

0 commit comments

Comments
 (0)
0