From 38d6a4e9ea30ce0ddba35fd9bf95feb1e798968f Mon Sep 17 00:00:00 2001 From: ssskip Date: Sun, 14 Jun 2020 22:48:34 +0800 Subject: [PATCH] m83 --- .travis.yml | 43 -------------------------------------- CMakeModules/Version.cmake | 2 +- README.md | 6 +++--- appveyor.yml | 2 +- 4 files changed, 5 insertions(+), 48 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1220980..b990cb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,34 +1,5 @@ matrix: include: - - os: linux - sudo: required - env: TARGET_CPU=x64 - addons: - apt: &x64-apt - sources: - - ubuntu-toolchain-r-test - packages: - - gcc-4.8 - - g++-4.8 - - libglib2.0-dev - - libgtk2.0-dev - - libxtst-dev - - libxss-dev - - libpci-dev - - libdbus-1-dev - - libgconf2-dev - - libgnome-keyring-dev - - libnss3-dev - - libasound2-dev - - libpulse-dev - - libudev-dev - - - os: linux - sudo: required - env: TARGET_CPU=x64 CMAKE_BUILD_TYPE=Debug - addons: - apt: *x64-apt - - os: osx osx_image: xcode7.3 env: TARGET_CPU=x64 @@ -67,17 +38,3 @@ install: script: - make -j 4 package - -before_deploy: - - export TRAVIS_ARTIFACTS=$(ls libwebrtc-*.tar.gz) - -deploy: - provider: releases - api_key: - secure: UazaqOOoifs5xE/xw+tjVnFAkl6MMJeZSW7B0DXX0wnHorKM5K72q9Ms3JYvJIp6DDV3vIeX/Yv/WQCnfRkDDhcbLohGZoOj2X3q53RSfJiOq/iIyPiPTRmkk3jQRBOvXl5zLePNaXU2vBuSgcM8az+wGjxaDLUB+EebSGRHPbXrGSnDDHaNnmb4Zm7SZ2DpL5ubRDlLTHst7Jh7OigrIblYKNCzwEc7UQsFNzLnu7dyZT4hF2Y+2KYl/3vUUkUGxu0AxVG7zilnjJE7O5gX76r+SQXs151uWwZeH41NNPxRSod51LKQS/V/I4afjjTaYC5+9lSUdNkOpEGrxU+61hSJvNGxL6rTqfiBTAOiJdMR3u4OmF+B72O0nUUpsNtlkSPBK9402Z65LH/UI2BIJ/oMfkjNSzTNTHvB+n+18nFryzUmgEJ4CEy7Yx5HGO1vXCP4OsHGAu5YCkDGV2uVttiYHlm2qWgTY59cQt61h1saQWMwj6Uivhz8XrS86K0r/YAS30t+7+/xG6dneXgctM9oYjIbVCFnImsE30FpWlCJvGnJzo37wctbTQscHs5iuqjt1an7AhQgOTMQwmtyyg32D6N9e4n+RJA9pEj3Qtpi51LVD1cdCahbZ1l4bURlNueqfB3d4oZvr9o/QNjm+qH/FRUWjAmWtbBr16ZXfiA= - file_glob: true - file: "${TRAVIS_ARTIFACTS}" - skip_cleanup: true - on: - tags: true - repo: aisouard/libwebrtc diff --git a/CMakeModules/Version.cmake b/CMakeModules/Version.cmake index 66c9d02..dc52829 100644 --- a/CMakeModules/Version.cmake +++ b/CMakeModules/Version.cmake @@ -20,4 +20,4 @@ set(LIBWEBRTC_API_VERSION set(LIBWEBRTC_VERSION ${LIBWEBRTC_API_VERSION}${LIBWEBRTC_BUILD_VERSION}) -set(LIBWEBRTC_WEBRTC_HEAD refs/branch-heads/72) +set(LIBWEBRTC_WEBRTC_HEAD refs/branch-heads/4103) diff --git a/README.md b/README.md index f290b2e..7162051 100644 --- a/README.md +++ b/README.md @@ -184,7 +184,7 @@ variable. ``` $ cmake -DWEBRTC_REVISION=be22d51 .. -$ cmake -DWEBRTC_BRANCH_HEAD=refs/branch-heads/72 .. +$ cmake -DWEBRTC_BRANCH_HEAD=refs/branch-heads/4103 .. ``` If both variables are set, it will focus on fetching the commit defined inside @@ -299,8 +299,8 @@ Apache License 2.0 © [Axel Isouard][author] [license-href]:https://opensource.org/licenses/Apache-2.0 [appveyor-img]:https://ci.appveyor.com/api/projects/status/yd1s303md3tt4w9a?svg=true [appveyor-href]:https://ci.appveyor.com/project/aisouard/libwebrtc -[travis-img]:https://travis-ci.org/aisouard/libwebrtc.svg?branch=master -[travis-href]:https://travis-ci.org/aisouard/libwebrtc +[travis-img]:https://travis-ci.org/workshopx-app/libwebrtc-build.svg?branch=dev +[travis-href]:https://travis-ci.org/workshopx/libwebrtc-build [gitter-img]:https://badges.gitter.im/aisouard/libwebrtc.svg [gitter-href]:https://gitter.im/aisouard/libwebrtc?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge [osx1011sdk]: https://github.com/phracker/MacOSX-SDKs/releases/download/MacOSX10.11.sdk/MacOSX10.11.sdk.tar.xz diff --git a/appveyor.yml b/appveyor.yml index 1ddac69..f232194 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,7 +17,7 @@ before_build: - cd c:\projects\libwebrtc - if "%platform%"=="x86" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017 - if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017 Win64 - - cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% -DWEBRTC_BRANCH_HEAD=refs/branch-heads/72 -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc . + - cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% -DWEBRTC_BRANCH_HEAD=refs/branch-heads/4103 -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc . build: project: PACKAGE.vcxproj