aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorcbdev <cb@cbcdn.com>2020-03-04 01:54:51 +0100
committercbdev <cb@cbcdn.com>2020-03-04 01:54:51 +0100
commit2a112633bfd56ddc9ece64973ef20654bf175429 (patch)
tree66b086040526f2a47fe99bcbea162fbb19d67b01
parentfc0afb039ddd4ba8f6161f2c9026e196f6d7ddc3 (diff)
downloadmidimonster-2a112633bfd56ddc9ece64973ef20654bf175429.tar.gz
midimonster-2a112633bfd56ddc9ece64973ef20654bf175429.tar.bz2
midimonster-2a112633bfd56ddc9ece64973ef20654bf175429.zip
Try to override Python 2.7 installation in CI, fix typo
-rw-r--r--.travis.yml3
-rw-r--r--README.md2
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index d9c03d3..b9b6969 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -144,7 +144,8 @@ before_install:
- git pull --tags
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
# 'brew install' sometimes returns non-zero for some arcane reason. Executing 'true' resets the exit code and allows Travis to continue building...
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache ola lua openssl jack python3; true; fi
+# Travis seems to have Python 2.7 installed by default, which for some reason prevents pkg-config from reading python3.pc
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache ola lua openssl jack python3; brew link --overwrite python; true; fi
# OpenSSL is not a proper install due to some Apple bull, so provide additional locations via the environment...
# Additionally, newer versions of this "recipe" seem to use the name 'openssl@1.1' instead of plain 'openssl' and there seems to be
# no way to programmatically get the link and include paths. Genius! Hardcoding the new version for the time being...
diff --git a/README.md b/README.md
index 19fb62c..124d6b0 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ one protocol into channel(s) on any other (or the same) supported protocol, for
* Control lighting fixtures or DAWs using gamepad controllers, trackballs, etc ([Example configuration](configs/evdev.cfg))
* Play games, type, or control your mouse using MIDI controllers ([Example configuration](configs/midi-mouse.cfg))
-If you encounter a bug or suspect a problem with a a protocol implementation, please
+If you encounter a bug or suspect a problem with a protocol implementation, please
[open an Issue](https://github.com/cbdevnet/midimonster/issues) or get in touch with us via
IRC on [Hackint in `#midimonster`](https://webirc.hackint.org/#irc://irc.hackint.org/#midimonster).
We are happy to hear from you!