Skip to content

Commit

Permalink
Merge pull request #192 from MycroftAI/development
Browse files Browse the repository at this point in the history
Release of v1.3.0.0
  • Loading branch information
forslund authored Feb 5, 2020
2 parents 67e43bf + b8b94bf commit 5e2c065
Show file tree
Hide file tree
Showing 78 changed files with 11,386 additions and 1,684 deletions.
84 changes: 46 additions & 38 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,70 @@
language: c
sudo: false

branches:
only:
- master
- development

matrix:
include:
- env: TASK="osx"
os: osx
compiler: clang
- os: linux
env: TASK="coverage" # code coverage
# workaround travis error:
# /Users/travis/build.sh: line 159: shell_session_update: command not found
# https://github.com/bizz84/SwiftyStoreKit/commit/68a67eef94670964e62ea473860b82780c386c77
before_install:
- gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 || curl -sSL https://rvm.io/mpapis.asc | gpg --import -
- rvm get stable
- env: TASK="ios"
os: osx
compiler: clang
# workaround travis error:
# /Users/travis/build.sh: line 159: shell_session_update: command not found
# https://github.com/bizz84/SwiftyStoreKit/commit/68a67eef94670964e62ea473860b82780c386c77
before_install:
- gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 || curl -sSL https://rvm.io/mpapis.asc | gpg --import -
- rvm get stable
- env: TASK="coverage" # code coverage
os: linux
dist: trusty
compiler: gcc
sudo: false
addons: {apt: {packages: [libasound2-dev]}}
after_success: bash <(curl -s https://codecov.io/bash)
- env: TASK="shared" # shared libraries
os: linux
dist: trusty
compiler: gcc
sudo: false
addons: {apt: {packages: [libasound2-dev]}}
- env: TASK="gcc6" # gcc-6
os: linux
dist: trusty
compiler: gcc-6
sudo: false
addons: {apt: {packages: [libasound2-dev, gcc-6], sources: [ubuntu-toolchain-r-test]}}
- env: TASK="arm-linux-gnueabihf-gcc" # arm build
os: linux
compiler: gcc
sudo: false
dist: trusty
compiler: arm-linux-gnueabihf-gcc
addons: {apt: {packages: [pkg-config-arm-linux-gnueabihf, libc6-dev-armhf-cross, gcc-arm-linux-gnueabihf, binutils-arm-linux-gnueabihf]}}
- env: TASK="winbuild" # windows build
os: linux
compiler: gcc
sudo: false
- env: TASK="winbuild_shared" # windows build shared libraries
os: linux
compiler: gcc
sudo: false
dist: trusty
compiler: i686-w64-mingw32-gcc
addons: {apt: {packages: [wine, xvfb, binutils-mingw-w64-i686, mingw-w64-i686-dev, gcc-mingw-w64-i686]}}
# - env: TASK="winbuild_shared" # windows build shared libraries
#os: linux
#dist: trusty
#compiler: i686-w64-mingw32-gcc
#addons: {apt: {packages: [wine, xvfb, binutils-mingw-w64-i686, mingw-w64-i686-dev, gcc-mingw-w64-i686]}}

jobs:
allow_failures:
- env: TASK="ios"

script:
script:
- ./run_testsuite.sh "$TASK"

after_success:
- if [ "x$TASK" = "xcoverage" ]; then bash <(curl -s https://codecov.io/bash); fi

env:
global:
Expand All @@ -43,28 +73,6 @@ env:
- secure: "VQXmVb9lTL4Yo58doWyCkdPTaDoe7sHPnOMCcJMPuxOpK1d/JWkm9Pp2UV8L/32JkCOO32azPJ1R1nr7uz6GFs0CwNAW+FO24mRex/h3CaH33eu7fQkq4MwfBqa19qqPoUX7KB8iofT6KyRxNrC8Z+zYPR9gogP2VrLSldi0Wva3+On/9tnj+e0/Cy2lTfjyXGvdFoDCM+WtbVz38IZrrAl7TG9azCorM0AaHr1U57DNVKQNlWdTJLiN2tzc5971nA7/Ws+ZoNK2ZWV6fIghgLju/h25JIqKpXB/Wi5QyUWY0pZ5oAEfqIgJchZ3e5qLS4bARsJwXTL8BFfwStA05qBTKI5M0lj93u1/d4tuVJzSP5LTJJelFYPsLVtyOKglFHr/Pb4PhieHJXjr/jig8P48nP+jgXcQjpP4uLZ3D1Z01///QCWCiHXloSurQkA0fhQSyeCHGNiTPEjAYfcFAjlH5/C1tsRLIerxm8hdGDhF0x7lg9j069B0Yet5GINiBeBZdTph1r6YWYQUqAwb8gAYt20KE/i/f5TSIFOd9jDOrPHLgSZX0N+C7x6PqVTxBGMksNJtf+PNOrBC5+VbYxdw0ldX1AveBD4oW9bcJ9wo3rAsFGZ8q6Vnl0r3U48eKWtMUf4//aq4Ab1h/LP8t+c+XyEXfMNh4WpJ4lySn4s="

addons:
apt:
packages:
- autotools-dev
- autoconf
- automake
- libtool
- pkg-config
- libasound2-dev
- libicu-dev
- binutils-arm-linux-gnueabihf
- gcc-arm-linux-gnueabihf
- g++-arm-linux-gnueabihf
- libc6-dev-armhf-cross
- pkg-config-arm-linux-gnueabihf
- mingw32
- mingw32-runtime
- wine
- xvfb
- gcc-6
- g++-6
sources:
- sourceline: 'ppa:ubuntu-toolchain-r/test'
coverity_scan:
project:
name: "MycroftAI/mimic"
Expand Down
1 change: 1 addition & 0 deletions ACKNOWLEDGEMENTS
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,4 @@ Richard Sproat and Kyoung-young Kim (UIUC)
Unitran: unicode to sampa grapheme mapping tables
Sun Microsystems
g72x code
Peter Drysdale: Hand optimized mlsa routine
46 changes: 46 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
Loading

0 comments on commit 5e2c065

Please sign in to comment.