From c368da04c51d55e278dbcdb15069265cf5e5daf0 Mon Sep 17 00:00:00 2001 From: Mario Reder Date: Tue, 3 Jul 2018 16:45:58 +0200 Subject: [PATCH 1/3] chore: Coverage report --- .travis.yml | 13 ++++++++++++- package.json | 1 + yarn.lock | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ca406b5..9f53c48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,26 @@ language: node_js + node_js: - "8.9.4" + env: - CXX=g++-4.8 + addons: apt: sources: - ubuntu-toolchain-r-test packages: - g++-4.8 + before_install: - npm install -g yarn --cache-min 999999999 + install: - - yarn \ No newline at end of file + - yarn + +jobs: + include: + - stage: Produce Coverage + node_js: "8.9.4" + script: jest --coverage --coverageReporters=text-lcov | ./node_modules/coveralls/bin/coveralls.js \ No newline at end of file diff --git a/package.json b/package.json index a4551cc..ebc088e 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ "babel-minify": "^0.4.1", "babel-minify-webpack-plugin": "^0.3.1", "babel-preset-env": "^1.6.0", + "coveralls": "^3.0.2", "eslint": "^4.18.0", "eslint-config-standard": "^11.0.0", "eslint-config-standard-with-typescript": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index 851f51b..c833cc3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1936,6 +1936,17 @@ core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" +coveralls@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.0.2.tgz#f5a0bcd90ca4e64e088b710fa8dda640aea4884f" + dependencies: + growl "~> 1.10.0" + js-yaml "^3.11.0" + lcov-parse "^0.0.10" + log-driver "^1.2.7" + minimist "^1.2.0" + request "^2.85.0" + cpx@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/cpx/-/cpx-1.5.0.tgz#185be018511d87270dedccc293171e37655ab88f" @@ -3423,6 +3434,10 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6 version "1.0.1" resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" +"growl@~> 1.10.0": + version "1.10.5" + resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" + growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -4344,6 +4359,13 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" +js-yaml@^3.11.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1" + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + js-yaml@^3.5.1, js-yaml@^3.7.0, js-yaml@^3.9.1: version "3.10.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc" @@ -4511,6 +4533,10 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" +lcov-parse@^0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3" + left-pad@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee" @@ -4607,6 +4633,10 @@ lodash@^4.2.0: version "4.17.10" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" +log-driver@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8" + log-symbols@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" @@ -5877,6 +5907,31 @@ request@^2.79.0, request@^2.83.0: tunnel-agent "^0.6.0" uuid "^3.1.0" +request@^2.85.0: + version "2.87.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e" + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.6.0" + caseless "~0.12.0" + combined-stream "~1.0.5" + extend "~3.0.1" + forever-agent "~0.6.1" + form-data "~2.3.1" + har-validator "~5.0.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.17" + oauth-sign "~0.8.2" + performance-now "^2.1.0" + qs "~6.5.1" + safe-buffer "^5.1.1" + tough-cookie "~2.3.3" + tunnel-agent "^0.6.0" + uuid "^3.1.0" + require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" From 3462bc6f230ee50a4196fa2ad02b5fcb6e2df099 Mon Sep 17 00:00:00 2001 From: Mario Reder Date: Tue, 3 Jul 2018 16:59:36 +0200 Subject: [PATCH 2/3] chore: CI build stage --- .travis.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f53c48..35e7cbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,14 +13,10 @@ addons: packages: - g++-4.8 -before_install: - - npm install -g yarn --cache-min 999999999 - -install: - - yarn - jobs: include: - - stage: Produce Coverage - node_js: "8.9.4" - script: jest --coverage --coverageReporters=text-lcov | ./node_modules/coveralls/bin/coveralls.js \ No newline at end of file + - stage: Test + script: jest --coverage --coverageReporters=text-lcov | ./node_modules/coveralls/bin/coveralls.js + - stage: Build + script: yarn build + \ No newline at end of file From 3d06e0c3ec50a885b2a9756b5615f763168b23be Mon Sep 17 00:00:00 2001 From: Mario Reder Date: Thu, 5 Jul 2018 08:45:36 +0200 Subject: [PATCH 3/3] chore: Travis CI build status badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 75a2a2f..b4185c8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Net64+ Server [![Discord](https://discordapp.com/api/guilds/354358899328942081/widget.png)](https://discord.gg/net64) +[![Build Status](https://api.travis-ci.org/Tarnadas/net64plus-server.svg?branch=master)](https://travis-ci.org/Tarnadas/net64plus-server) [![Coverage Status](https://coveralls.io/repos/github/Tarnadas/net64plus-server/badge.svg?branch=master)](https://coveralls.io/github/Tarnadas/net64plus-server?branch=master) Net64 aka SM64O allows playing Super Mario 64 in an online multiplayer mode. Net64+ is the official continuation of the program and features an integrated server list.