From 16bae70750a9c6076404e4a98cc811cbaa5d23f3 Mon Sep 17 00:00:00 2001 From: Matt Briggs Date: Sun, 2 Feb 2020 09:48:24 -0800 Subject: [PATCH 1/4] readme --- .circleci/config.yml | 4 ++++ .circleci/dockerfile-test-entrypoint.sh | 4 +--- README.md | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fb86fabe1..754cd32c2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,6 +10,10 @@ jobs: steps: - checkout + - run: + name: Toolchain Versions + command: | + c++ --version && cmake --version && git --version && cat /etc/os-release - run: name: Cmake command: | diff --git a/.circleci/dockerfile-test-entrypoint.sh b/.circleci/dockerfile-test-entrypoint.sh index 698a7fec7..3f4c5237a 100644 --- a/.circleci/dockerfile-test-entrypoint.sh +++ b/.circleci/dockerfile-test-entrypoint.sh @@ -7,9 +7,7 @@ sep() { sep echo "version info" -g++ --version -cmake --version -cat /etc/os-release +c++ --version && cmake --version && git --version && cat /etc/os-release sep cmake \ diff --git a/README.md b/README.md index d83563183..e16927019 100755 --- a/README.md +++ b/README.md @@ -21,9 +21,10 @@ This project is a C++ library for working with MusicXML files. MusicXML files a ## Compiling The project is tested with the following: -* Xcode 10.1 Apple LLVM version 10.0.0 (clang-1000.11.45.5) +* Xcode 10.1 Apple LLVM version 10.0.0 and higher * g++ (Debian 6.3.0-18+deb9u1) 6.3.0 20170516 * cmake version 3.7.2 +* MSVC2019 Visual Studio should be very close to working. A good first pull request would be to compile with VS and add the version to the list above. From 23b898cbcde9dd0eaa2f2855c74b71e9003bdd93 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sun, 2 Feb 2020 10:14:07 -0800 Subject: [PATCH 2/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e16927019..1366fab84 100755 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ This project is a C++ library for working with MusicXML files. MusicXML files a ## Compiling The project is tested with the following: -* Xcode 10.1 Apple LLVM version 10.0.0 and higher +* Clang (Xcode 10 and higher) * g++ (Debian 6.3.0-18+deb9u1) 6.3.0 20170516 * cmake version 3.7.2 * MSVC2019 From 1dd8a35e9b187e53041d72aa9ca51fb59f85db09 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sun, 2 Feb 2020 10:40:14 -0800 Subject: [PATCH 3/4] badges --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1366fab84..e0c151869 100755 --- a/README.md +++ b/README.md @@ -9,10 +9,8 @@ MusicXML Class Library ----------------------------------------- -![CircleCI](https://circleci.com/gh/webern/mx.svg?style=svg&circle-token=2f4d1a33a0825d9634b458a2306ed22482314661) - -Badges seem to be [broken](https://github.com/github/markup/issues/224), go to the [CircleCI project](https://circleci.com/gh/webern/mx) for build status. - + * Master: [![CircleCI](https://circleci.com/gh/webern/mx/tree/master.svg?style=svg)](https://circleci.com/gh/webern/mx/tree/master) + * Develop: [![CircleCI](https://circleci.com/gh/webern/mx/tree/develop.svg?style=svg)](https://circleci.com/gh/webern/mx/tree/develop) ## Introduction From 8da1a560c43ab22995b455c77e9781dca17995da Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sun, 2 Feb 2020 10:44:52 -0800 Subject: [PATCH 4/4] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index e0c151869..7f3e982bb 100755 --- a/README.md +++ b/README.md @@ -9,8 +9,7 @@ MusicXML Class Library ----------------------------------------- - * Master: [![CircleCI](https://circleci.com/gh/webern/mx/tree/master.svg?style=svg)](https://circleci.com/gh/webern/mx/tree/master) - * Develop: [![CircleCI](https://circleci.com/gh/webern/mx/tree/develop.svg?style=svg)](https://circleci.com/gh/webern/mx/tree/develop) +[![CircleCI](https://circleci.com/gh/webern/mx.svg?style=svg)](https://circleci.com/gh/webern/mx) ## Introduction