diff --git a/.editorconfig b/.editorconfig index cee094a7..79bd2701 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,6 +13,6 @@ indent_style = space insert_final_newline = true trim_trailing_whitespace = true -[*.{ttl,ttl.in,yml}] +[*.{ttl,ttl.in,sh,yml}] indent_size = 2 indent_style = space diff --git a/.gitignore b/.gitignore index c6bae06c..ceeb7326 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ node_modules/ .sass-cache *.lock *.sublime-* +*.code-* diff --git a/.travis.yml b/.travis.yml index 11a9c269..3af812aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,22 @@ language: cpp - -matrix: +jobs: include: - - os: linux + - os: linux + arch: amd64 + dist: bionic + addons: + apt: + sources: + - sourceline: 'ppa:ubuntu-toolchain-r/test' + packages: + - gcc-8 + - g++-8 + - doxygen + env: + - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" + + - os: linux + arch: arm64 dist: bionic addons: apt: @@ -38,11 +52,11 @@ after_success: deploy: provider: releases skip_cleanup: true - api_key: + token: secure: cc6IkdalZRb+lOWzPkubCUvTcP9lBwiNBBPkXWVmeX7YXkdQlsoVQ11bZThd1Go+5Lt+jGFtEqEjJ0L7GxpdatEeBMEK5HXl0QtHAybl9J4Ax7hKba8FSX5RqPFOuKixCob6eCqJRchT26qRsQE/WYMY8DmproEFGMBHk0K4HXDWEq0HP8dbWVx3KudvellCYszUrVQYb2s49sDiF8OwSog5TiqdBqO5PRcqyt2ySmHgqwBYq7XV0pb+DxcKJcc7/gCBpBN7nyEhl8gmKELypLF81l8xUDBUjRy1jjf0r33ISHpX1MWeWIN9YzSNL0aLPQvwynAQ7OeckFAIMABah2UuYcxdd4ioXduPTbprVYpSwIyyxkeafK2jxgxwoKWi9GJZ3yAUHNS/V7Gh5DsFb7C6QDqr5gOxOMtjHwjmHnxmD44SsugjSosVzirvQR+JbrSsPsmZThQjCvwG+7hO3JatX4BXA7bp9WtgsoMrCH61gCp2GogQVLvYpgRpVErKK8PMTkt71OouewTDqD5iwc3N/2pNWP3cXxpPegerjl4R2sY0sZ57WRfW8ts7akPyqJZa2uKpzpM0eXy35fZl6WoJSlIv3akCnzdtLtaWAptzfXhgRSlF/33+gZ3jRcSP7ca2YpUviuZ+KYk+uGfMh092CMRMjPv1Et5h7zYGD+o= file: "$DEPLOYFILE" on: - repo: sfztools/sfizz + repo: ${TRAVIS_REPO_SLUG} tags: true notifications: @@ -56,4 +70,4 @@ notifications: - "%{commit_subject}" - "Commit URL : https://github.com/%{repository_slug}/commit/%{commit}" - "Change View : %{compare_url}" - - "Build Details : %{build_url}" + - "Build Details : %{build_url}" diff --git a/.travis/before_install.sh b/.travis/before_install.sh index 248954a6..489096cc 100755 --- a/.travis/before_install.sh +++ b/.travis/before_install.sh @@ -1,12 +1,20 @@ #!/bin/bash -set -e +set -ex -if [ "$TRAVIS_OS_NAME" = "linux" ]; then - wget https://cmake.org/files/v3.13/cmake-3.13.0-Linux-x86_64.sh - sudo sh cmake-3.13.0-Linux-x86_64.sh --skip-license --prefix=/usr/local +cmake_dir="cmake-3.13.0-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}" +cmake_arc="${cmake_dir}.tar.gz" +cmake_url="https://github.com/${TRAVIS_REPO_SLUG}/releases/download/${TRAVIS_OS_NAME}/${cmake_arc}" + +if [ ${TRAVIS_OS_NAME} = "linux" ]; then + wget -q ${cmake_url} + tar xzf ${cmake_arc} + cd ${TRAVIS_BUILD_DIR}/${cmake_dir} + sudo cp bin/* /usr/local/bin/ + sudo cp -r doc /usr/local/share/ + sudo cp -r share/* /usr/local/share/ export PATH="/usr/local/bin:$PATH" # FIXME -elif [ "$TRAVIS_OS_NAME" = "osx" ]; then +elif [ ${TRAVIS_OS_NAME} = "osx" ]; then sudo ln -s /usr/local /opt/local brew update brew upgrade cmake