Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Travis fix & JSBML update #37

Merged
merged 6 commits into from
May 21, 2020
Merged

Travis fix & JSBML update #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
19f8d0e
replaced oraclejdk8 to openjdk11 in .travis.yml
hemilpanchiwala May 12, 2020
ae34768
updated JSBML to 1.5 in pom.xml
hemilpanchiwala May 12, 2020
f440922
fixed travis build link in README.md
hemilpanchiwala May 13, 2020
06e43af
Merge branch 'master' into develop
hemilpanchiwala May 13, 2020
0af04fd
ignored the compTests tracked in issue #36
hemilpanchiwala May 19, 2020
48a53b0
added oraclejdk11 build option in travis
hemilpanchiwala May 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
language: java

jdk:
- oraclejdk8
- openjdk11
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you also add oraclejdk11 as second build option. Would be great if we can test against openjdk and oraclejdk

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

- oraclejdk11

install:
- cd src/test
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![License (LGPL version 3)](https://img.shields.io/badge/license-LGPLv3.0-blue.svg?style=plastic)](http://opensource.org/licenses/LGPL-3.0)
[![Latest version](https://img.shields.io/badge/Latest_version-1.4.0-brightgreen.svg?style=plastic)](https://github.com/draeger-lab/SBSCL/releases/)
[![DOI](https://img.shields.io/badge/DOI-10.1186%2F1752--0509--7--55-blue.svg?style=plastic)](https://doi.org/10.1186/1752-0509-7-55)
[![Build Status](https://travis-ci.org/shalinshah1993/SBSCL.svg?branch=master&style=plastic)](https://travis-ci.org/shalinshah1993/SBSCL)
[![Build Status](https://travis-ci.com/draeger-lab/SBSCL.svg?branch=master&style=plastic)](https://travis-ci.com/draeger-lab/SBSCL)

*Authors*: [Roland Keller](https://github.com/RolandKeller5), [Andreas Dräger](https://github.com/draeger), [Shalin Shah](https://github.com/shalinshah1993), [Matthias König](https://github.com/matthiaskoenig), [Alexander Dörr](https://github.com/a-doerr), [Richard Adams](https://github.com/otter606), [Nicolas Le Novère](https://github.com/lenov), [Max Zwiessele](https://github.com/mzwiessele)

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
<dependency>
<groupId>org.sbml.jsbml</groupId>
<artifactId>jsbml</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
Expand Down
7 changes: 6 additions & 1 deletion src/test/java/org/simulator/comp/CompSimulatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ public CompSimulatorTest(String resource) {

@Parameterized.Parameters(name= "{index}: {0}")
public static Iterable<Object[]> data(){
HashSet<String> skip = null;
HashSet<String> skip = new HashSet<>();
skip.add("test6.xml");
skip.add("test7.xml");
skip.add("test8.xml");
skip.add("test9.xml");
skip.add("test10.xml");
String filter = null;

// find all comp models
Expand Down