(#40): Remove mac x86 build, set appveyor matrix the right way

This commit is contained in:
Axel Isouard 2017-03-25 12:00:49 +01:00
parent 9ee8a5aec6
commit 77208bccbd
No known key found for this signature in database
GPG key ID: 4E64BB3EAAF31C29
3 changed files with 16 additions and 35 deletions

View file

@ -16,14 +16,6 @@ matrix:
sudo: required sudo: required
env: TARGET_CPU=x64 CMAKE_BUILD_TYPE=Debug env: TARGET_CPU=x64 CMAKE_BUILD_TYPE=Debug
- os: osx
osx_image: xcode7.3
env: TARGET_CPU=x86
- os: osx
osx_image: xcode7.3
env: TARGET_CPU=x86 CMAKE_BUILD_TYPE=Debug
- os: osx - os: osx
osx_image: xcode7.3 osx_image: xcode7.3
env: TARGET_CPU=x64 env: TARGET_CPU=x64
@ -70,7 +62,7 @@ install:
- git submodule update - git submodule update
- mkdir out - mkdir out
- cd out - cd out
- cmake -DTARGET_CPU=$TARGET_CPU .. - cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DTARGET_CPU=$TARGET_CPU ..
script: script:
- make -j 4 package - make -j 4 package
@ -84,9 +76,7 @@ deploy:
- libwebrtc-$TRAVIS_TAG-linux-x64.tar.gz - libwebrtc-$TRAVIS_TAG-linux-x64.tar.gz
- libwebrtc-$TRAVIS_TAG-linux-x86-debug.tar.gz - libwebrtc-$TRAVIS_TAG-linux-x86-debug.tar.gz
- libwebrtc-$TRAVIS_TAG-linux-x64-debug.tar.gz - libwebrtc-$TRAVIS_TAG-linux-x64-debug.tar.gz
- libwebrtc-$TRAVIS_TAG-mac-x86.tar.gz
- libwebrtc-$TRAVIS_TAG-mac-x64.tar.gz - libwebrtc-$TRAVIS_TAG-mac-x64.tar.gz
- libwebrtc-$TRAVIS_TAG-mac-x86-debug.tar.gz
- libwebrtc-$TRAVIS_TAG-mac-x64-debug.tar.gz - libwebrtc-$TRAVIS_TAG-mac-x64-debug.tar.gz
skip_cleanup: true skip_cleanup: true
overwrite: true overwrite: true

View file

@ -43,7 +43,7 @@ supported platforms and architectures.
</tr> </tr>
<tr> <tr>
<th align="center">macOS</th> <th align="center">macOS</th>
<td></td> <td align="center">-</td>
<td align="center"></td> <td align="center"></td>
<td align="center">-</td> <td align="center">-</td>
<td align="center">-</td> <td align="center">-</td>

View file

@ -3,23 +3,13 @@ os: Visual Studio 2015
matrix: matrix:
fast_finish: true fast_finish: true
environment: platform:
matrix: - x86
- platform: x86 - x64
configuration: Debug
CMAKE_GENERATOR: "Visual Studio 14 2015"
- platform: x86 configuration:
configuration: Release - Debug
CMAKE_GENERATOR: "Visual Studio 14 2015" - Release
- platform: x64
configuration: Debug
CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
- platform: x64
configuration: Release
CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
clone_folder: c:\projects\libwebrtc clone_folder: c:\projects\libwebrtc
@ -28,20 +18,21 @@ build:
before_build: before_build:
- cd c:\projects\libwebrtc - cd c:\projects\libwebrtc
- git submodule update --init --recursive - if "%platform%"=="x86" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015
- cmake -G %CMAKE_GENERATOR% -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc . - if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 Win64
- cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc .
artifacts: artifacts:
- path: libwebrtc-0.0.1-rc.4-win-x86-debug.zip
name: libwebrtc-0.0.1-rc.4-win-x86-debug.zip
- path: libwebrtc-0.0.1-rc.4-win-x86.zip - path: libwebrtc-0.0.1-rc.4-win-x86.zip
name: libwebrtc-0.0.1-rc.4-win-x86.zip name: libwebrtc-0.0.1-rc.4-win-x86.zip
- path: libwebrtc-0.0.1-rc.4-win-x64-debug.zip - path: libwebrtc-0.0.1-rc.4-win-x86-debug.zip
name: libwebrtc-0.0.1-rc.4-win-x64-debug.zip name: libwebrtc-0.0.1-rc.4-win-x86-debug.zip
- path: libwebrtc-0.0.1-rc.4-win-x64.zip - path: libwebrtc-0.0.1-rc.4-win-x64.zip
name: libwebrtc-0.0.1-rc.4-win-x64.zip name: libwebrtc-0.0.1-rc.4-win-x64.zip
- path: libwebrtc-0.0.1-rc.4-win-x64-debug.zip
name: libwebrtc-0.0.1-rc.4-win-x64-debug.zip
test: off test: off