Skip to content

Commit 5e2c065

Browse files
authored
Merge pull request #192 from MycroftAI/development
Release of v1.3.0.0
2 parents 67e43bf + b8b94bf commit 5e2c065

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+11386
-1684
lines changed

.travis.yml

Lines changed: 46 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,70 @@
11
language: c
2+
sudo: false
3+
4+
branches:
5+
only:
6+
- master
7+
- development
28

39
matrix:
410
include:
511
- env: TASK="osx"
612
os: osx
713
compiler: clang
8-
- os: linux
9-
env: TASK="coverage" # code coverage
14+
# workaround travis error:
15+
# /Users/travis/build.sh: line 159: shell_session_update: command not found
16+
# https://github.com/bizz84/SwiftyStoreKit/commit/68a67eef94670964e62ea473860b82780c386c77
17+
before_install:
18+
- gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 || curl -sSL https://rvm.io/mpapis.asc | gpg --import -
19+
- rvm get stable
20+
- env: TASK="ios"
21+
os: osx
22+
compiler: clang
23+
# workaround travis error:
24+
# /Users/travis/build.sh: line 159: shell_session_update: command not found
25+
# https://github.com/bizz84/SwiftyStoreKit/commit/68a67eef94670964e62ea473860b82780c386c77
26+
before_install:
27+
- gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 || curl -sSL https://rvm.io/mpapis.asc | gpg --import -
28+
- rvm get stable
29+
- env: TASK="coverage" # code coverage
30+
os: linux
31+
dist: trusty
1032
compiler: gcc
11-
sudo: false
33+
addons: {apt: {packages: [libasound2-dev]}}
34+
after_success: bash <(curl -s https://codecov.io/bash)
1235
- env: TASK="shared" # shared libraries
1336
os: linux
37+
dist: trusty
1438
compiler: gcc
15-
sudo: false
39+
addons: {apt: {packages: [libasound2-dev]}}
1640
- env: TASK="gcc6" # gcc-6
1741
os: linux
42+
dist: trusty
1843
compiler: gcc-6
19-
sudo: false
44+
addons: {apt: {packages: [libasound2-dev, gcc-6], sources: [ubuntu-toolchain-r-test]}}
2045
- env: TASK="arm-linux-gnueabihf-gcc" # arm build
2146
os: linux
22-
compiler: gcc
23-
sudo: false
47+
dist: trusty
48+
compiler: arm-linux-gnueabihf-gcc
49+
addons: {apt: {packages: [pkg-config-arm-linux-gnueabihf, libc6-dev-armhf-cross, gcc-arm-linux-gnueabihf, binutils-arm-linux-gnueabihf]}}
2450
- env: TASK="winbuild" # windows build
2551
os: linux
26-
compiler: gcc
27-
sudo: false
28-
- env: TASK="winbuild_shared" # windows build shared libraries
29-
os: linux
30-
compiler: gcc
31-
sudo: false
52+
dist: trusty
53+
compiler: i686-w64-mingw32-gcc
54+
addons: {apt: {packages: [wine, xvfb, binutils-mingw-w64-i686, mingw-w64-i686-dev, gcc-mingw-w64-i686]}}
55+
# - env: TASK="winbuild_shared" # windows build shared libraries
56+
#os: linux
57+
#dist: trusty
58+
#compiler: i686-w64-mingw32-gcc
59+
#addons: {apt: {packages: [wine, xvfb, binutils-mingw-w64-i686, mingw-w64-i686-dev, gcc-mingw-w64-i686]}}
60+
61+
jobs:
62+
allow_failures:
63+
- env: TASK="ios"
3264

33-
script:
65+
script:
3466
- ./run_testsuite.sh "$TASK"
3567

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

3969
env:
4070
global:
@@ -43,28 +73,6 @@ env:
4373
- 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="
4474

4575
addons:
46-
apt:
47-
packages:
48-
- autotools-dev
49-
- autoconf
50-
- automake
51-
- libtool
52-
- pkg-config
53-
- libasound2-dev
54-
- libicu-dev
55-
- binutils-arm-linux-gnueabihf
56-
- gcc-arm-linux-gnueabihf
57-
- g++-arm-linux-gnueabihf
58-
- libc6-dev-armhf-cross
59-
- pkg-config-arm-linux-gnueabihf
60-
- mingw32
61-
- mingw32-runtime
62-
- wine
63-
- xvfb
64-
- gcc-6
65-
- g++-6
66-
sources:
67-
- sourceline: 'ppa:ubuntu-toolchain-r/test'
6876
coverity_scan:
6977
project:
7078
name: "MycroftAI/mimic"

ACKNOWLEDGEMENTS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,4 @@ Richard Sproat and Kyoung-young Kim (UIUC)
7474
Unitran: unicode to sampa grapheme mapping tables
7575
Sun Microsystems
7676
g72x code
77+
Peter Drysdale: Hand optimized mlsa routine

CODE_OF_CONDUCT.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
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.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
## Our Responsibilities
26+
27+
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.
28+
29+
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.
30+
31+
## Scope
32+
33+
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.
34+
35+
## Enforcement
36+
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at kathy.reid@mycroft.ai. 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.
38+
39+
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.
40+
41+
## Attribution
42+
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
44+
45+
[homepage]: http://contributor-covenant.org
46+
[version]: http://contributor-covenant.org/version/1/4/

0 commit comments

Comments
 (0)