Skip to content

Commit fc4f972

Browse files
committed
Merge branch 'fix-queued-workflow-delete' of https://github.com/obasekiosa/cwlviewer into fix-queued-workflow-delete
2 parents b30a0d5 + b99c75c commit fc4f972

File tree

5 files changed

+66
-39
lines changed

5 files changed

+66
-39
lines changed

.github/workflows/ci-build.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: CWL Viewer Build
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-20.04
14+
15+
steps:
16+
- uses: actions/[email protected]
17+
with:
18+
ref: ${{ github.event.pull_request.head.ref }}
19+
repository: ${{ github.event.pull_request.head.repo.full_name }}
20+
21+
- name: MongoDB in GitHub Actions
22+
uses: supercharge/[email protected]
23+
24+
- name: Restore dependency cache
25+
uses: actions/[email protected]
26+
with:
27+
path: ~/.m2/repository
28+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
29+
restore-keys: |
30+
${{ runner.os }}-maven-
31+
32+
- name: Set up Java
33+
uses: actions/setup-java@v2
34+
with:
35+
distribution: 'adopt'
36+
java-version: '8'
37+
38+
- name: Install system packages
39+
run: |
40+
sudo apt-get -qq update
41+
sudo apt-get install graphviz python3-pip
42+
sudo pip install cwltool
43+
44+
- name: Build and test with Maven
45+
run: |
46+
./mvnw test -B
47+
48+
- name: Coverage report
49+
run: |
50+
mvn prepare-package -DskipTests=true
51+
mvn cobertura:cobertura coveralls:report --no-transfer-progress -DrepoToken=$COVERALLS_SECRET -DpullRequest=${{ github.event.number }}
52+
env:
53+
CI_NAME: github
54+
COVERALLS_SECRET: ${{ secrets.GITHUB_TOKEN }}

.travis.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This is a [Spring Boot](http://projects.spring.io/spring-boot/) MVC application which fetches [Common Workflow Language](http://www.commonwl.org/) files from a Github repository and creates a page for it detailing the main workflow and its inputs, outputs and steps.
44

5-
[![Build Status](https://travis-ci.org/common-workflow-language/cwlviewer.svg?branch=master)](https://travis-ci.org/common-workflow-language/cwlviewer) [![Coverage Status](https://coveralls.io/repos/github/common-workflow-language/cwlviewer/badge.svg)](https://coveralls.io/github/common-workflow-language/cwlviewer) [![Gitter](https://img.shields.io/gitter/room/gitterHQ/gitter.svg)](https://gitter.im/common-workflow-language/cwlviewer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![](https://images.microbadger.com/badges/image/commonworkflowlanguage/cwlviewer.svg)](https://microbadger.com/images/commonworkflowlanguage/cwlviewer "MicroBadger commonworkflowlanguage/cwlviewer") [![Docker image commonworkflowlanguage/cwlviewer](https://images.microbadger.com/badges/version/commonworkflowlanguage/cwlviewer.svg)](https://hub.docker.com/r/commonworkflowlanguage/cwlviewer/ "Docker Hub commonworkflowlanguage/cwlviewer")
5+
[![Build Status](https://github.com/common-workflow-language/cwlviewer/workflows/CWL%20Viewer%20Build/badge.svg?branch=main)](https://github.com/common-workflow-language/cwlviewer/actions?query=workflow%3A%22CWL%20Viewer%20Build%22) [![Coverage Status](https://coveralls.io/repos/github/common-workflow-language/cwlviewer/badge.svg)](https://coveralls.io/github/common-workflow-language/cwlviewer) [![Gitter](https://img.shields.io/gitter/room/gitterHQ/gitter.svg)](https://gitter.im/common-workflow-language/cwlviewer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![](https://images.microbadger.com/badges/image/commonworkflowlanguage/cwlviewer.svg)](https://microbadger.com/images/commonworkflowlanguage/cwlviewer "MicroBadger commonworkflowlanguage/cwlviewer") [![Docker image commonworkflowlanguage/cwlviewer](https://images.microbadger.com/badges/version/commonworkflowlanguage/cwlviewer.svg)](https://hub.docker.com/r/commonworkflowlanguage/cwlviewer/ "Docker Hub commonworkflowlanguage/cwlviewer")
66
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.823534.svg)](https://doi.org/10.5281/zenodo.823534)
77

88

@@ -166,10 +166,12 @@ look like a commit ID. Note that this might break previous permalinks.
166166

167167
# Documentation
168168

169-
2017 Poster https://f1000research.com/posters/6-1075
169+
2017 Poster https://doi.org/10.7490/f1000research.1114375.1
170170

171171
2017 Video overview https://youtu.be/_yjhVTmvxLU
172172

173+
2017 Technical Report https://doi.org/10.5281/zenodo.823295
174+
173175
# Thanks
174176

175177
Developers and [contributors](https://github.com/common-workflow-language/cwlviewer/graphs/contributors) include:

pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2525
<java.version>1.8</java.version>
26-
<jena.version>3.16.0</jena.version>
26+
<jena.version>3.15.0</jena.version>
2727
<!-- BEGIN should correspond to https://repo1.maven.org/maven2/org/apache/jena/jena/3.9.0/jena-3.9.0.pom -->
28-
<ver.jsonldjava>0.13.2</ver.jsonldjava>
29-
<ver.jackson>2.11.3</ver.jackson>
28+
<ver.jsonldjava>0.13.0</ver.jsonldjava>
29+
<ver.jackson>2.11.1</ver.jackson>
3030
<!-- END -->
3131
</properties>
3232

@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>org.yaml</groupId>
7272
<artifactId>snakeyaml</artifactId>
73-
<version>1.27</version>
73+
<version>1.26</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.github.jabbalaci</groupId>
@@ -106,7 +106,7 @@
106106
<dependency>
107107
<groupId>org.eclipse.jgit</groupId>
108108
<artifactId>org.eclipse.jgit</artifactId>
109-
<version>5.9.0.202009080501-r</version>
109+
<version>5.8.0.202006091008-r</version>
110110
</dependency>
111111
<dependency>
112112
<groupId>org.mockito</groupId>
@@ -132,10 +132,10 @@
132132

133133
<profiles>
134134
<profile>
135-
<id>travis</id>
135+
<id>github</id>
136136
<activation>
137137
<property>
138-
<name>env.TRAVIS</name>
138+
<name>env.CI</name>
139139
<value>true</value>
140140
</property>
141141
</activation>

src/main/resources/templates/about.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h1>About</h1>
4747
tooling.</p>
4848

4949
<p>Cite as: <code><a href="https://doi.org/10.7490/f1000research.1114375.1">https://doi.org/10.7490/f1000research.1114375.1</a></code></p>
50-
<p>Technical Report: <a href="https://doi.org/10.5281/zenodo.848163">https://doi.org/10.5281/zenodo.848163</a></p>
50+
<p>Technical Report: <a href="https://doi.org/10.5281/zenodo.823295">https://doi.org/10.5281/zenodo.823295</a></p>
5151

5252
<p>CWL Viewer also won the <a href="https://f1000research.com/">F1000Research</a> Best Poster
5353
<a href="https://bioexcel.eu/poster-award-for-cwlviewer/">Award</a> at

0 commit comments

Comments
 (0)