Update azure build. Temporarily disable travis ci matrix notifs

azure-pipelines
Joseph Donofry 6 years ago
parent 349d2109c9
commit f4c688767a
No known key found for this signature in database
GPG Key ID: E8A1D78EF044B0CB
  1. 4
      .ci/install.sh
  2. 2
      .travis.yml
  3. 2
      CMakeLists.txt

@ -4,7 +4,7 @@ set -ex
if [ "$TRAVIS_OS_NAME" = "osx" ]; then if [ "$TRAVIS_OS_NAME" = "osx" ]; then
brew update brew update
brew install qt5 lmdb clang-format ninja libsodium cmark brew install qt5 lmdb clang-format ninja libsodium cmark autoconf automake libtool || true
# probably should update this to check if these are actually installed or not # probably should update this to check if these are actually installed or not
# but this installs boost, cmake, and icu4c if they aren't installed already # but this installs boost, cmake, and icu4c if they aren't installed already
@ -49,7 +49,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
sudo apt-add-repository -y "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main" sudo apt-add-repository -y "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main"
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -qq -y clang-5.0 sudo apt-get install -qq -y clang
sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty

@ -5,7 +5,7 @@ dist: trusty
notifications: notifications:
webhooks: webhooks:
urls: urls:
- https://scalar.vector.im/api/neb/services/hooks/dHJhdmlzLWNpLyU0MHJlZF9za3klM0FvY2Vhbi5qb2Vkb25vZnJ5LmNvbS8lMjFldkFxa1BIWnVQSElHZWVuaGklM0FvY2Vhbi5qb2Vkb25vZnJ5LmNvbQ # - https://scalar.vector.im/api/neb/services/hooks/dHJhdmlzLWNpLyU0MHJlZF9za3klM0FvY2Vhbi5qb2Vkb25vZnJ5LmNvbS8lMjFldkFxa1BIWnVQSElHZWVuaGklM0FvY2Vhbi5qb2Vkb25vZnJ5LmNvbQ
on_success: always on_success: always
on_failure: always on_failure: always
on_start: never on_start: never

@ -110,7 +110,7 @@ if(NOT MSVC)
if (NOT CMAKE_COMPILER_IS_GNUCXX) if (NOT CMAKE_COMPILER_IS_GNUCXX)
# -Wshadow is buggy and broken in GCC, so do not enable it. # -Wshadow is buggy and broken in GCC, so do not enable it.
# see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79328 # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79328
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow")
endif() endif()
endif() endif()

Loading…
Cancel
Save