From 47468c3596eb91a091363bb1787e73936b0f6bb4 Mon Sep 17 00:00:00 2001
From: Gregor Billing <gbilling@worldcubeassociation.org>
Date: Thu, 6 May 2021 22:11:24 +0200
Subject: [PATCH] Adjust Coveralls coverage info publication

---
 .github/workflows/gradle.yml                  |  7 ++++---
 tnoodle-ui/package.json                       | 14 ++++++-------
 tnoodle-ui/src/main/api/wca.api.ts            |  2 +-
 .../{components => model}/ScrambleProgram.ts  |  0
 tnoodle-ui/yarn.lock                          | 21 -------------------
 5 files changed, 12 insertions(+), 32 deletions(-)
 rename tnoodle-ui/src/main/{components => model}/ScrambleProgram.ts (100%)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 382013575..dcba14a98 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -26,6 +26,7 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew build
     - name: Push coverage data to Coveralls
-      env:
-        COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-      run: ./gradlew yarn_coveralls
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        path-to-lcov: 'tnoodle-ui/coverage/lcov.info'
diff --git a/tnoodle-ui/package.json b/tnoodle-ui/package.json
index b008ce366..c3860193b 100644
--- a/tnoodle-ui/package.json
+++ b/tnoodle-ui/package.json
@@ -30,7 +30,6 @@
         "build": "react-scripts build",
         "test": "react-scripts test --watchAll --watchAll=false --coverage",
         "eject": "react-scripts eject",
-        "coveralls": "cat ./coverage/lcov.info | coveralls",
         "prettier": "prettier --check ."
     },
     "eslintConfig": {
@@ -53,16 +52,17 @@
     },
     "jest": {
         "collectCoverageFrom": [
-            "src/**/*.{js,jsx}",
-            "!src/index.js",
-            "!src/serviceWorker.js",
-            "!src/main/api/**.js",
-            "!**/Interceptor.jsx"
+            "src/**/*.{ts,tsx}",
+            "!src/index.tsx",
+            "!src/reportWebVitals.ts",
+            "!src/react-app-env.d.ts",
+            "!src/main/api/**.ts",
+            "!src/main/model/**.ts",
+            "!**/Interceptor.tsx"
         ]
     },
     "devDependencies": {
         "@types/lodash": "^4.14.168",
-        "coveralls": "^3.1.0",
         "prettier": "^2.2.1"
     }
 }
diff --git a/tnoodle-ui/src/main/api/wca.api.ts b/tnoodle-ui/src/main/api/wca.api.ts
index 70cfd03fc..e2b11fd00 100644
--- a/tnoodle-ui/src/main/api/wca.api.ts
+++ b/tnoodle-ui/src/main/api/wca.api.ts
@@ -1,6 +1,6 @@
 import Axios from "axios";
 import { BASE_PATH } from "../../App";
-import ScrambleProgram from "../components/ScrambleProgram";
+import ScrambleProgram from "../model/ScrambleProgram";
 import Competition from "../model/Competition";
 import Person from "../model/Person";
 import Wcif from "../model/Wcif";
diff --git a/tnoodle-ui/src/main/components/ScrambleProgram.ts b/tnoodle-ui/src/main/model/ScrambleProgram.ts
similarity index 100%
rename from tnoodle-ui/src/main/components/ScrambleProgram.ts
rename to tnoodle-ui/src/main/model/ScrambleProgram.ts
diff --git a/tnoodle-ui/yarn.lock b/tnoodle-ui/yarn.lock
index 403bc1bac..86f4fd548 100644
--- a/tnoodle-ui/yarn.lock
+++ b/tnoodle-ui/yarn.lock
@@ -3693,17 +3693,6 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-coveralls@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.1.0.tgz#13c754d5e7a2dd8b44fe5269e21ca394fb4d615b"
-  integrity sha512-sHxOu2ELzW8/NC1UP5XVLbZDzO4S3VxfFye3XYCznopHy02YjNkHcj5bKaVw2O7hVaBdBjEdQGpie4II1mWhuQ==
-  dependencies:
-    js-yaml "^3.13.1"
-    lcov-parse "^1.0.0"
-    log-driver "^1.2.7"
-    minimist "^1.2.5"
-    request "^2.88.2"
-
 create-ecdh@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
@@ -7008,11 +6997,6 @@ last-call-webpack-plugin@^3.0.0:
     lodash "^4.17.5"
     webpack-sources "^1.1.0"
 
-lcov-parse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0"
-  integrity sha1-6w1GtUER68VhrLTECO+TY73I9+A=
-
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
@@ -7164,11 +7148,6 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-driver@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
-  integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==
-
 loglevel@^1.6.8:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"