From 2c2d6cd8c9ecb49fd194366c2f73d541a45b3292 Mon Sep 17 00:00:00 2001 From: Unknown Name Date: Fri, 1 Feb 2019 10:18:09 +0000 Subject: [PATCH 1/7] Update Makefile --- Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d8a6fd4f..42b4076b 100644 --- a/Makefile +++ b/Makefile @@ -11,16 +11,20 @@ EMAIL_ARGS= test: test1 test2 test3 test4 test-go-mini -test1: +git: + git config --global user.email "you@owlsemtest.com" + git config --global user.name "Unknown Name" + +test1: git $(CMD) $(EMAIL_ARGS) -c -d pato -t my-ontology1 myont -test2: +test2: git $(CMD) $(EMAIL_ARGS) -c -d pato -d ro -t my-ontology2 myont -test3: +test3: git $(CMD) $(EMAIL_ARGS) -c -d pato -d cl -d ro -t my-ontology3 myont -test4: +test4: git $(CMD) -c -C examples/triffo/project.yaml test-go-mini: From b3776504de53361fc393ce086f402ad2c3883558 Mon Sep 17 00:00:00 2001 From: Unknown Name Date: Fri, 1 Feb 2019 17:51:29 +0000 Subject: [PATCH 2/7] Moved got config into travis --- .travis.yml | 2 ++ Makefile | 10 +++------- examples/hp/project.yaml | 1 + 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 08123219..a846143b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ services: before_install: - docker pull obolibrary/odkfull + - git config --global user.email "you@owlsemtest.com" + - git config --global user.name "Unknown Name" # command to run tests # https://github.com/INCATools/ontology-starter-kit/issues/25 diff --git a/Makefile b/Makefile index 42b4076b..fa9e9757 100644 --- a/Makefile +++ b/Makefile @@ -11,17 +11,13 @@ EMAIL_ARGS= test: test1 test2 test3 test4 test-go-mini -git: - git config --global user.email "you@owlsemtest.com" - git config --global user.name "Unknown Name" - -test1: git +test1: $(CMD) $(EMAIL_ARGS) -c -d pato -t my-ontology1 myont -test2: git +test2: $(CMD) $(EMAIL_ARGS) -c -d pato -d ro -t my-ontology2 myont -test3: git +test3: $(CMD) $(EMAIL_ARGS) -c -d pato -d cl -d ro -t my-ontology3 myont test4: git diff --git a/examples/hp/project.yaml b/examples/hp/project.yaml index 5d2d77ef..2e71178a 100644 --- a/examples/hp/project.yaml +++ b/examples/hp/project.yaml @@ -4,6 +4,7 @@ github_org: obophenotype repo: human-phenotype-ontology #report_fail_on: ERROR report_fail_on: ERROR +use_dosdps: TRUE export_formats: - owl - obo From f01a9440a95865750f4d5c9daccc3940626a410a Mon Sep 17 00:00:00 2001 From: Unknown Name Date: Fri, 1 Feb 2019 18:04:41 +0000 Subject: [PATCH 3/7] set git config at docker run time --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a846143b..d0caba83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,14 @@ services: before_install: - docker pull obolibrary/odkfull - - git config --global user.email "you@owlsemtest.com" - - git config --global user.name "Unknown Name" # command to run tests # https://github.com/INCATools/ontology-starter-kit/issues/25 # EMAIL_ARGS='-e obo-ci-reports-all@groups.io' script: - - docker run -v $PWD/:/work -w /work --rm -ti obolibrary/odkfull make test + - docker run -v $PWD/:/work -w /work --rm -ti obolibrary/odkfull git config --global user.email "you@owlsemtest.com" &&\ + git config --global user.name "Unknown Name" &&\ + make test #after_success: # coveralls From 85c3105832f53c1879a0cf3220c74a55ea05da6b Mon Sep 17 00:00:00 2001 From: Unknown Name Date: Fri, 1 Feb 2019 18:13:24 +0000 Subject: [PATCH 4/7] Update .travis.yml --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0caba83..3ec395ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,7 @@ before_install: # https://github.com/INCATools/ontology-starter-kit/issues/25 # EMAIL_ARGS='-e obo-ci-reports-all@groups.io' script: - - docker run -v $PWD/:/work -w /work --rm -ti obolibrary/odkfull git config --global user.email "you@owlsemtest.com" &&\ - git config --global user.name "Unknown Name" &&\ - make test + - docker run -v $PWD/:/work -w /work --rm -ti obolibrary/odkfull git config --global user.email "you@owlsemtest.com" && git config --global user.name "Unknown Name" && make test #after_success: # coveralls From 78a5da7e01cc7129ccba0c666cfb68e92f6db0ad Mon Sep 17 00:00:00 2001 From: Unknown Name Date: Fri, 1 Feb 2019 18:14:35 +0000 Subject: [PATCH 5/7] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fa9e9757..d8a6fd4f 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ test2: test3: $(CMD) $(EMAIL_ARGS) -c -d pato -d cl -d ro -t my-ontology3 myont -test4: git +test4: $(CMD) -c -C examples/triffo/project.yaml test-go-mini: From 2f209faa7af93f94764945d35a40a6bac19cdac4 Mon Sep 17 00:00:00 2001 From: Unknown Name Date: Fri, 1 Feb 2019 18:28:36 +0000 Subject: [PATCH 6/7] added python version print to travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3ec395ca..7073b774 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: # https://github.com/INCATools/ontology-starter-kit/issues/25 # EMAIL_ARGS='-e obo-ci-reports-all@groups.io' script: - - docker run -v $PWD/:/work -w /work --rm -ti obolibrary/odkfull git config --global user.email "you@owlsemtest.com" && git config --global user.name "Unknown Name" && make test + - docker run -v $PWD/:/work -w /work --rm -ti obolibrary/odkfull python3 --version && git config --global user.email "you@owlsemtest.com" && git config --global user.name "Unknown Name" && make test #after_success: # coveralls From 7d13519579e55e45ac893ee7d562238887a8c4ae Mon Sep 17 00:00:00 2001 From: matentzn Date: Fri, 1 Feb 2019 18:53:09 +0000 Subject: [PATCH 7/7] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7073b774..a2f7cb6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: # https://github.com/INCATools/ontology-starter-kit/issues/25 # EMAIL_ARGS='-e obo-ci-reports-all@groups.io' script: - - docker run -v $PWD/:/work -w /work --rm -ti obolibrary/odkfull python3 --version && git config --global user.email "you@owlsemtest.com" && git config --global user.name "Unknown Name" && make test + - docker run -v $PWD/:/work -w /work --rm -ti obolibrary/odkfull /bin/bash -c "python3 --version; git config --global user.email "you@owlsemtest.com"; git config --global user.name \"Unknown Name\" && make test" #after_success: # coveralls