From 51f0e1d1ffb6d1f0157a62182e62add230bf0612 Mon Sep 17 00:00:00 2001 From: n8225 Date: Sat, 17 Aug 2019 11:47:31 -0500 Subject: [PATCH] Remove Danger and update travis --- .travis.yml | 14 ++++++-------- tests/test.js | 6 ++++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1101a7c..9374576e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,21 +3,19 @@ language: node_js node_js: - "node" -env: - global: - - secure: "PyOX7l+atMbQ5VoaPMM3VIdUfwioFnjZcwpBJOGPAOhpxwnRwVd/5mrPbnjC5F/GnSSEmZL2hFcxDBlVX4XTRMDXjrhkdiHHr8sXHVJ+JmTYCxHfr4HSICuLcqtopl0RtNRcbk6arIZqd0jij6pJQDgZ3Jt5er6GNZTBluUUEmdvtjoGtex3PJ1ZoE46bf7l+PhyUHT2yqUg8XrJbAr9DwerT4YMZzxjfFMlJV/A5RbtpXGty5s1RmD+xhEaj8kqVu+ln5t7A8anHaw/BX+Txm/1B2EEgWx2IiZ2JcZsM1jM5irrsQH/gX/x133mx5ta1P/06d5iD9GD/vJTrPZz+d0UGUlxNadXtaPHWUUvxKtaTLB6vHk8Kzs1Be/e0DL7KbO5pjw4KOWgnUPntLYM+btk3Q5IHC0G8z5H/W0PW2SoqpL99PNbSqcLUkK6kcJBrnCZKfoQHwgB5Oe9X0go/L3RD0Qu7w4jPBJFZI7139wvhs4jz5Vh7Au61fHNMOvNstZsyDvE5hraz2bbzIJqyVV8EJqFe6G5kSOiMbm6gtq/emtBVY+De68w2PUNyMBXJ0LpBunyi8NmLy8UzaXIAzk6Ko/mldVx4qkspP++cmIh79hitETEwG9mwqcK27hst/BfQ64jHPCyLZTA6Zm1l60/jDTbb+NEoKY9sLeJ7M0=" before_install: - rvm install 2.6.2 - gem install awesome_bot - - gem install danger before_script: script: - - git diff master.. --unified=0 README.md | grep --perl-regexp --only-matching --silent "(?<=^\+).*" >> temp.md || (exit 0) - - node tests/test.js temp.md - - awesome_bot temp.md --allow-redirect || (exit 0) - - danger --dangerfile=tests/Dangerfile --verbose + - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then git diff origin/master -U0 README.md | grep -Pos "(?<=^\+).*" >> temp.md && node tests/test.js temp.md; else node tests/test.js temp.md; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then awesome_bot temp.md --allow-redirect --skip-save-results; else awesome_bot README.md --allow-redirect --skip-save-results; fi' notifications: email: false + +branches: + only: + - master \ No newline at end of file diff --git a/tests/test.js b/tests/test.js index 94e7798c..ee3867e8 100644 --- a/tests/test.js +++ b/tests/test.js @@ -4,7 +4,7 @@ const fs = require('fs'); let log = '{\n'; let issuelog = ' "message": "#### Syntax Issues\\n\\n Name | Entry\\n----|----------------------\\n'; - +let fails = '' const file = fs.readFileSync(process.argv[2], 'utf8'); // Reads argv into var file function entryFilter(md) { // Function to find lines with entries @@ -66,11 +66,13 @@ function entryErrorCheck(md) { // entryArray[i].error = findError(entries[i]) //WIP totalFail += 1; issuelog += `${entryArray[i].name} | ${entries[i]} \\n`; + fails += `${entries[i]} \n\n`; } } } if (totalFail > 0) { // Logs # passed & failed to console, and failures to syntaxcheck.json - console.log(`${totalFail} Failed, ${totalPass} Passed, of ${total}`); + console.log(`${totalFail} Failed, ${totalPass} Passed, of ${total}\n-----------------------------`); + console.log(fails) log += ` "error": true,\n "title": "Found ${totalFail} entries with syntax error(s).",\n`; fs.writeFileSync('syntaxcheck.json', `${log} ${issuelog} "\n}`); process.exit(1);