Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
51 changes: 51 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Build

on: [ push, pull_request, workflow_dispatch ]

jobs:
java:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: "Node Cache"
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package.json', '**/package-lock.json') }}

- name: "Node Modules Cache"
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package.json', '**/package-lock.json') }}

- name: "Maven Cache"
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

- name: "Setup Node"
uses: actions/setup-node@v2
with:
node-version: 10

- name: "Setup Java"
uses: actions/setup-java@v1
with:
java-version: 1.8

- name: "Maven and Node Tests"
run: mvn clean test cobertura:cobertura jacoco:report coveralls:report -DdryRun=true -DtestClient

- name: "Combine Coverage"
run: jq 'reduce inputs as $i (.; .source_files += $i.source_files)' target/coveralls.json src/main/webapp/coverage/coveralls.json > coveralls.json

- name: "Send to Coveralls"
uses: MikeEdgar/github-action@raw_coverage_file
with:
github-token: ${{ secrets.github_token }}
path-to-file: './coveralls.json'
coverage-format: raw
55 changes: 55 additions & 0 deletions .github/workflows/ghpages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: GHPages

on:
push:
branches:
- $default_branch

workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: "Node Cache"
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package.json', '**/package-lock.json') }}

- name: "Node Modules Cache"
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package.json', '**/package-lock.json') }}

- name: "Maven Cache"
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

- name: "Setup Node"
uses: actions/setup-node@v2
with:
node-version: 10

- name: "Setup Java"
uses: actions/setup-java@v1
with:
java-version: 1.8

- name: "Maven and Node Tests"
run: mvn clean test cobertura:cobertura jacoco:report coveralls:report -DdryRun=true -DtestClient

- name: "Deploy GH-Pages"
uses: JamesIves/github-pages-deploy-action@3.7.1
with:
github_token: ${{ secrets.github_token }}
branch: gh-pages
folder: target/generated-docs
clean: true
single_commit: true
48 changes: 0 additions & 48 deletions .travis.yml

This file was deleted.

5 changes: 2 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,8 @@ module.exports = function (grunt) {
coveralls: {
options: {
debug: true,
coverageDir: "src/main/webapp/coverage/"
coverageDir: "src/main/webapp/coverage/",
dryRun: true
}
}

Expand All @@ -227,8 +228,6 @@ module.exports = function (grunt) {

grunt.registerTask("default", ["jshint", "clean", "symlink"]);

grunt.registerTask("coverage-preprocess", ["concat", "usemin", "clean", "copy", "symlink"]);

grunt.registerTask("coverage", ["jshint", "symlink", "coveralls"]);

grunt.registerTask("watch", ["watch"]);
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[![Build Status](https://travis-ci.org/TAMULib/CAP.svg?branch=master)](https://travis-ci.org/TAMULib/CAP)
[![Coverage Status](https://coveralls.io/repos/github/TAMULib/Cap/badge.svg?branch=master)](https://coveralls.io/github/TAMULib/Cap?branch=master)
[![Build Status](https://github.com/TAMULib/CAP/workflows/Build/badge.svg)](https://github.com/TAMULib/CAP/actions?query=workflow%3ABuild)
[![Coverage Status](https://coveralls.io/repos/github/TAMULib/CAP/badge.svg)](https://coveralls.io/github/TAMULib/CAP)
[![GHPages Status](https://github.com/TAMULib/CAP/workflows/GHPages/badge.svg)](https://github.com/TAMULib/CAP/actions?query=workflow%3AGHPages)

# CAP

CAP is the Curator's Administration Platform developed and maintained by [Texas A&M University Libraries](http://library.tamu.edu).
CAP is the Curator's Administration Platform developed and maintained by [Texas A&M University Libraries](http://library.tamu.edu).

CAP is an open source application that has been designed to provide a common user interface (UI) and application programing interface (API) for any Institutional Repository (IR) participating within a Digital Asset Management Ecosystem (DAME.)

Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
"grunt": "grunt",
"grunt:develop": "grunt develop",
"grunt:deploy": "grunt deploy",
"test": "node node_modules/karma/bin/karma start src/main/webapp/tests/karma.conf.js --single-run --browsers Firefox,ChromeHeadlessNoSandbox",
"test-single-run": "node node_modules/karma/bin/karma start src/main/webapp/tests/karma.conf.js --single-run",
"test-ci": "node node_modules/karma/bin/karma start src/main/webapp/tests/karma.conf.js --no-auto-watch --single-run --browsers=ChromeHeadlessNoSandbox",
"test": "karma start src/main/webapp/tests/karma.conf.js --single-run --browsers Firefox,ChromeHeadlessNoSandbox",
"test-single-run": "karma start src/main/webapp/tests/karma.conf.js --single-run",
"test-ci": "karma start src/main/webapp/tests/karma.conf.js --no-auto-watch --single-run --browsers=ChromeHeadlessNoSandbox",
"posttest-ci": "grunt coverage",
"preupdate-webdriver": "npm install",
"update-webdriver": "webdriver-manager update",
"preprotractor": "npm run update-webdriver",
Expand Down
12 changes: 9 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId>
<type>pom</type>
<version>3.10.0</version>
<version>3.16.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -248,10 +248,16 @@
<url>https://artifacts.library.tamu.edu/repository/maven-snapshots/</url>
</repository>

<repository>
<id>mvnrepository</id>
<name>Maven Central Repository</name>
<url>https://repo1.maven.org/maven2/</url>
</repository>

<repository>
<id>jitpack.io</id>
<name>JitPack for Maven</name>
<url>https://jitpack.io</url>
<url>https://jitpack.io/</url>
</repository>

</repositories>
Expand Down Expand Up @@ -891,7 +897,7 @@
<executable>npm${npm-extension}</executable>
<arguments>
<argument>run</argument>
<argument>test</argument>
<argument>test-ci</argument>
</arguments>
</configuration>
<goals>
Expand Down