From 6cd6c096e391de12e949b00468d82aff2081a523 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 13 Jul 2020 12:22:11 -0500
Subject: [PATCH 1/3] Move coveralls to after_success

---
 .travis.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0d65d76f41..e56707a96c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,10 +35,11 @@ before_install:
   - google-chrome-stable --version
 
 install:
-  # Start up DSpace 7 using the entities database dump
+  # Start up a test DSpace 7 REST backend using the entities database dump
   - docker-compose -f ./docker/docker-compose-travis.yml up -d
   # Use the dspace-cli image to populate the assetstore. Triggers a discovery and oai update
   - docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
+  # Install all local dependencies (retry if initially fails)
   - travis_retry yarn install
 
 before_script:
@@ -49,9 +50,14 @@ before_script:
   #- curl http://localhost:8080/server/
 
 script:
+  # build app and run all tests
   - yarn run ci
-  - cat coverage/dspace-angular-cli/lcov.info | ./node_modules/coveralls/bin/coveralls.js
 
 after_script:
   # Shutdown docker after everything runs
   - docker-compose -f ./docker/docker-compose-travis.yml down
+
+# After a successful build and test (see 'script'), send code coverage reports to coveralls.io
+# These code coverage reports are generated by the coveralls node module in our package.json
+after_success:
+  - cat coverage/dspace-angular-cli/lcov.info | ./node_modules/coveralls/bin/coveralls.js

From e94fbfdcd0c78fb6766dc868b47daac730f2148d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 13 Jul 2020 12:22:31 -0500
Subject: [PATCH 2/3] Allow for any version of coveralls compatible with 3.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 21a89400bf..0bbf156c9d 100644
--- a/package.json
+++ b/package.json
@@ -140,7 +140,7 @@
     "codelyzer": "^5.0.0",
     "compression-webpack-plugin": "^3.0.1",
     "copy-webpack-plugin": "^5.1.1",
-    "coveralls": "3.0.0",
+    "coveralls": "^3.0.0",
     "css-loader": "3.4.0",
     "cssnano": "^4.1.10",
     "deep-freeze": "0.0.1",

From 4648348bd17a840faae0a1692d4102c768c84e5d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 13 Jul 2020 14:08:47 -0500
Subject: [PATCH 3/3] Remove deprecated "sudo" key. Add new recommended "os"
 key

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e56707a96c..90d50d1b08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-sudo: required
+os: linux
 dist: bionic
 language: node_js