Skip to content

20191224 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 24, 2019
Merged

20191224 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1a0824
Fix version for AppVeyor.
fancycode Feb 24, 2019
9f37952
Switch to Xenial for CI runs.
fancycode Feb 24, 2019
316aa59
Get latest stable version of Wine when testing.
fancycode Feb 24, 2019
5f83e41
Merge pull request #92 from fancycode/ci-xenial
fancycode Feb 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,47 @@ sudo: true

matrix:
include:
- env: PLATFORM=x86_64 UNICODE= CMAKE=
- env: PLATFORM=x86_64 UNICODE= CMAKE= WINE_PACKAGE=winehq-stable:amd64
addons:
apt:
packages:
- binutils-mingw-w64-x86-64
- mingw-w64-x86-64-dev
- g++-mingw-w64-x86-64
- gcc-mingw-w64-x86-64
- wine:amd64
- env: PLATFORM=i686 UNICODE= CMAKE=
- env: PLATFORM=i686 UNICODE= CMAKE= WINE_PACKAGE=winehq-stable:i386
addons:
apt:
packages:
- binutils-mingw-w64-i686
- mingw-w64-i686-dev
- g++-mingw-w64-i686
- gcc-mingw-w64-i686
- wine:i386
- env: PLATFORM=x86_64 UNICODE=1 CMAKE=
- env: PLATFORM=x86_64 UNICODE=1 CMAKE= WINE_PACKAGE=winehq-stable:amd64
addons:
apt:
packages:
- binutils-mingw-w64-x86-64
- mingw-w64-x86-64-dev
- g++-mingw-w64-x86-64
- gcc-mingw-w64-x86-64
- wine:amd64
- env: PLATFORM=i686 UNICODE=1 CMAKE=
- env: PLATFORM=i686 UNICODE=1 CMAKE= WINE_PACKAGE=winehq-stable:i386
addons:
apt:
packages:
- binutils-mingw-w64-i686
- mingw-w64-i686-dev
- g++-mingw-w64-i686
- gcc-mingw-w64-i686
- wine:i386
- env: PLATFORM=x86_64 UNICODE= CMAKE=1
- env: PLATFORM=x86_64 UNICODE= CMAKE=1 WINE_PACKAGE=winehq-stable:amd64
addons:
apt:
packages:
- binutils-mingw-w64-x86-64
- mingw-w64-x86-64-dev
- g++-mingw-w64-x86-64
- gcc-mingw-w64-x86-64
- wine:amd64
- env: PLATFORM=i686 UNICODE= CMAKE=1
- env: PLATFORM=i686 UNICODE= CMAKE=1 WINE_PACKAGE=winehq-stable:i386
addons:
apt:
packages:
Expand All @@ -56,8 +51,7 @@ matrix:
- mingw-w64-i686-dev
- g++-mingw-w64-i686
- gcc-mingw-w64-i686
- wine:i386
- env: PLATFORM=x86_64 UNICODE=1 CMAKE=1
- env: PLATFORM=x86_64 UNICODE=1 CMAKE=1 WINE_PACKAGE=winehq-stable:amd64
addons:
apt:
packages:
Expand All @@ -66,8 +60,7 @@ matrix:
- mingw-w64-x86-64-dev
- g++-mingw-w64-x86-64
- gcc-mingw-w64-x86-64
- wine:amd64
- env: PLATFORM=i686 UNICODE=1 CMAKE=1
- env: PLATFORM=i686 UNICODE=1 CMAKE=1 WINE_PACKAGE=winehq-stable:i386
addons:
apt:
packages:
Expand All @@ -76,15 +69,19 @@ matrix:
- mingw-w64-i686-dev
- g++-mingw-w64-i686
- gcc-mingw-w64-i686
- wine:i386

language: cpp

dist: xenial

cache:
- apt
- ccache

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

script:
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Status available at
# https://ci.appveyor.com/project/fancycode/memorymodule
version: #{build}
version: 1.0.{build}

os:
- Visual Studio 2015
Expand Down