Skip to content
This repository was archived by the owner on Mar 9, 2021. It is now read-only.

Commit bc3a091

Browse files
vinaypuppalvinaypuppal
committed
merge remote master
2 parents ec75b42 + 87b7c65 commit bc3a091

File tree

5 files changed

+45
-17
lines changed

5 files changed

+45
-17
lines changed

‎.travis.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@ before_install:
88
- 'export PATH="$HOME/.yarn/bin:$PATH"'
99
cache: yarn
1010
after_script:
11-
- >-
12-
yarn export && cd out && NOW_ALIAS=coderplex-app.now.sh node
13-
../scripts/now.js -p
11+
- yarn export && cd out && NOW_ALIAS=coderplex-app.now.sh node ../scripts/now.js -p
1412
branches:
1513
only:
1614
- master
1715
env:
1816
global:
19-
- secure: >-
20-
nDYIe5Cw1FgD1Iqv2FKRG5Q6Jvvml4ovKPjMRD3BBWinPHe6xbZGtPi0P/Jqt6PFmu5o3aiWQO4ffYnFYUW8N8Tu86RMr0sLQ7Sv6MiE0JxL+7Y+VBZ9h1i9MARiTFQRUw9lrToNa13bnuGy5YNfx4nVUo63vluRTCW6AZd0h01tgEjbhTAamWf1z/n26ACMNJSr2iQ7coakLwpsQvdXMcUe5tAduzoQtLb8DiXdbXO+D7Oepl4dQvOfosa14wW5Z6MN6Y/AxxJ246Cngm3hgZF7IpLCD49H7shXHHSaIcYkJtnSRozKSBEdz34+Jqw+278vcWOA4n2advAhWd2oCAUa0drmu8Nu2Obtrx4oAUQhDwBxfQhbmXpen2Ry5DKp86AurTxgXc+n6bPfjwGdjha2u6cd1fCwpTu5pgnOeX101U/Bu68tAz/EIErCDxHDW/WyrBkVKG3rkABjv3pse4ZJuMy3eeKp+8o2P29b77GHxhKdEw4SvZSfdfnVooABcC6p/sqcumuTvJn20AZkBdhuxGDYSEfNecKPAEHRV8nUQUbMVT7bImQAgl4O4QhHcOfrthbNnQJM94DX0Z2xRQ5sdRmzhe4Ob771EUByNdMO7k2O1KsJAWQ78KhTdOJKoiIp2sH9zRGCTjnTIoCDJx4zBTGHpqV0+R4ltth7T4Q=
21-
- secure: >-
22-
Gj+PgZbNTBJ4C/5WZPjMicUWYJCt+gVnuDNjJCyahqFOOHvTowl3WKoeRwxSf/it9xqW/su6JrehgQixn0OVhkVWL8FVgs5TCvFtFBdYTHTrPIi+2T0sulp/NscsDG2hh3d6WD+AnC4u5QtRkTuh7IZEpLkRTHBwedRhfjvPOQaaT5wZCVMiPrscRhsNHJ4pTl2lEyU0BaLCxWkuAysWw5i7ZhxwtDNZroDuyIqhtJbJIXD9DkPQOuekJGyk+hqXJ7EdtHudltnh4M3Q44799k6n0NQIhjmkF5IZHnZVCKrZh+L0I/xyLU1WbY1uU4fShneryziFzKSAuDobmMC/z/kq/apSbPWuILeY5IMR/33NCz4dcb1bJG5IwCo35NHrqwfxElCkX9L1IyodCVXnZbC5jmwbbqyFHIPlmIUGhRxQyebZrXVGbJe8gHx4aMLpWeDrKL2PqbPOZkwfdDX/sbxhLjChUF6Pr9xFSQ12K/k17peE7KtpHpeIzDs2W0suQlm+/yH9auqUKXrrPp63U61gEY5TQzvBoUa7eTCOxdhTJqFhQw6DmFNDT2Qv06XiSbRt+L+N/EHQDljOADaw+0Z8LbOWa90l8klLIgsNvy8mzPx+kFieLeSh5ShlTguvNBQBK+bsLigc1/5Q3B62HEqLzY8piw+X4SLaHvdTeK8=
17+
- secure: nDYIe5Cw1FgD1Iqv2FKRG5Q6Jvvml4ovKPjMRD3BBWinPHe6xbZGtPi0P/Jqt6PFmu5o3aiWQO4ffYnFYUW8N8Tu86RMr0sLQ7Sv6MiE0JxL+7Y+VBZ9h1i9MARiTFQRUw9lrToNa13bnuGy5YNfx4nVUo63vluRTCW6AZd0h01tgEjbhTAamWf1z/n26ACMNJSr2iQ7coakLwpsQvdXMcUe5tAduzoQtLb8DiXdbXO+D7Oepl4dQvOfosa14wW5Z6MN6Y/AxxJ246Cngm3hgZF7IpLCD49H7shXHHSaIcYkJtnSRozKSBEdz34+Jqw+278vcWOA4n2advAhWd2oCAUa0drmu8Nu2Obtrx4oAUQhDwBxfQhbmXpen2Ry5DKp86AurTxgXc+n6bPfjwGdjha2u6cd1fCwpTu5pgnOeX101U/Bu68tAz/EIErCDxHDW/WyrBkVKG3rkABjv3pse4ZJuMy3eeKp+8o2P29b77GHxhKdEw4SvZSfdfnVooABcC6p/sqcumuTvJn20AZkBdhuxGDYSEfNecKPAEHRV8nUQUbMVT7bImQAgl4O4QhHcOfrthbNnQJM94DX0Z2xRQ5sdRmzhe4Ob771EUByNdMO7k2O1KsJAWQ78KhTdOJKoiIp2sH9zRGCTjnTIoCDJx4zBTGHpqV0+R4ltth7T4Q=
18+
- secure: Gj+PgZbNTBJ4C/5WZPjMicUWYJCt+gVnuDNjJCyahqFOOHvTowl3WKoeRwxSf/it9xqW/su6JrehgQixn0OVhkVWL8FVgs5TCvFtFBdYTHTrPIi+2T0sulp/NscsDG2hh3d6WD+AnC4u5QtRkTuh7IZEpLkRTHBwedRhfjvPOQaaT5wZCVMiPrscRhsNHJ4pTl2lEyU0BaLCxWkuAysWw5i7ZhxwtDNZroDuyIqhtJbJIXD9DkPQOuekJGyk+hqXJ7EdtHudltnh4M3Q44799k6n0NQIhjmkF5IZHnZVCKrZh+L0I/xyLU1WbY1uU4fShneryziFzKSAuDobmMC/z/kq/apSbPWuILeY5IMR/33NCz4dcb1bJG5IwCo35NHrqwfxElCkX9L1IyodCVXnZbC5jmwbbqyFHIPlmIUGhRxQyebZrXVGbJe8gHx4aMLpWeDrKL2PqbPOZkwfdDX/sbxhLjChUF6Pr9xFSQ12K/k17peE7KtpHpeIzDs2W0suQlm+/yH9auqUKXrrPp63U61gEY5TQzvBoUa7eTCOxdhTJqFhQw6DmFNDT2Qv06XiSbRt+L+N/EHQDljOADaw+0Z8LbOWa90l8klLIgsNvy8mzPx+kFieLeSh5ShlTguvNBQBK+bsLigc1/5Q3B62HEqLzY8piw+X4SLaHvdTeK8=
19+
- secure: Gk315eP6SnXbLp95cIfPEk1AutpkFLG7ja4z+5KKpCOLcdR9KkYuLPbxALDa6KFBlHoIuWJwMdcXUBEI+6eLPlzDIH2CAEIuqzilDobPcGiF+yqqP0cD0Dl5nJDPb9fIN7rmas0BRFDNXdOOHe0M3hr0xKAhjdCFne+/2miVU+bCYA0F2obVbk10NbGJCjEMV8JBkerX4bQFhoQg3G1lBZhQ8/0Ux7KwBdTfqAxqqLQp+5uzcg1lpCUslXVfuztRcdrjYzwVhG4RhRQ69tWc94LWKSnexFxL+Dz3rGB3t+LkzLXXmFaFB8q22JvAsiitDbs4hyFwKbM3P630q0+oFS2+KU7lXGErr90Qzt4oLwNyPQ3IHakft6G8tyMPfY+bVeuNTxRmNkq43HE1lk7aFX2XVDTBwtUZVLFFiih/aT2Nc0o3GHh16m/UYXxSItZpU6M2AQk9c1W3VSQ4m67837Apd85Hcx8QWwshFDiIcu5rMOFi/09c7k0JQ6UlxoFJNCv/U68F8cADNiV9pX+gh/b0h6/fBG1o46T/oq/QQDEsK+FaYuHB8XHwVQPDXTXGSOsGcp6bwxWtMKeQdg0x6kCND4xZv9MK/02J0XuOOEpj+8Bb5gRNaB6eQqqIppKf6lG9OJ+zSBezshaeapS843j+vOazPB8FpQpjRpfKNRI=

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
"semantic-ui-react": "^0.71.3"
5454
},
5555
"devDependencies": {
56+
"axios": "0.16.2",
5657
"babel-eslint": "^7.2.3",
5758
"babel-plugin-lodash": "^3.2.11",
5859
"cross-env": "^5.0.2",

‎scripts/now.js

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const spawn = require('cross-spawn');
66
const travisAfterAll = require('travis-after-all');
77
const urlRegex = require('url-regex');
88
const argv = require('yargs').argv;
9+
const axios = require('axios');
910

1011
const nowCli = require.resolve('now/download/dist/now');
1112

@@ -15,6 +16,7 @@ if (!process.env.CI || !process.env.TRAVIS) {
1516

1617
const githubToken = process.env.GH_TOKEN;
1718
const nowToken = process.env.NOW_TOKEN;
19+
const discordHook = process.env.DISCORD_HOOK;
1820

1921
if (!githubToken) {
2022
throw new Error('Missing required environment variable GH_TOKEN');
@@ -68,10 +70,6 @@ function deploy(context, sha) {
6870
const alias = context === 'production' && process.env.NOW_ALIAS;
6971
let stdout = '';
7072

71-
if (alias) {
72-
args.push(...['--alias', alias]);
73-
}
74-
7573
if (argv.p || argv.public) {
7674
args.push(...['-p']);
7775
}
@@ -99,16 +97,38 @@ function deploy(context, sha) {
9997
},
10098
noop,
10199
);
100+
axios
101+
.post(discordHook, {
102+
content: `Δ Now ${context} deployment failed. See Travis logs for details.`,
103+
username: 'coderplex-bot',
104+
})
105+
.then(() => {
106+
console.log(`SUCCESS posted to discord`);
107+
})
108+
.catch(console.log);
102109
});
103110

104111
child.on('close', () => {
105-
const target_url = alias || getUrl(stdout);
112+
const target_url = getUrl(stdout);
113+
const comment = url =>
114+
`### New Δ Now ${context} deployment complete\n- ✅ **Build Passed**\n- 🚀 **URL** : ${url}\n---\nNote: **This is autogenerated through travis-ci build**`;
115+
if (alias) {
116+
spawn(nowCli, ['alias', target_url, alias]);
117+
axios
118+
.post(discordHook, {
119+
content: comment(`${alias} and https://coderplex.org`),
120+
username: 'coderplex-bot',
121+
})
122+
.then(() => {
123+
console.log(`SUCCESS posted to discord`);
124+
})
125+
.catch(console.log);
126+
}
106127
if (ghPR) {
107-
const comment = `### New Δ Now ${context} deployment complete\n- ✅ **Build Passed**\n- 🚀 **Staging URL** : ${target_url}\n---\nNote: **This is autogenerated through Travis build**`;
108-
console.log(comment);
128+
console.log(comment(target_url));
109129
ghPR.createComment(
110130
{
111-
body: comment,
131+
body: comment(target_url),
112132
},
113133
(err, res) => {
114134
console.log(err, res);

‎utils/urls.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export const pastEventsMeetupURL =
2-
'https://api.meetup.com/freeCodeCamp-Hyderabad/events?desc=1&photo-host=public&page=20&sig_id=216741149&status=past&only=id%2Cname%2Ctime%2Cyes_rsvp_count%2Cdescription%2Cvenue%2Cstatus%2Clink&sig=9c90b0db31ddca7bad153c802491c36295eb3170';
2+
'https://api.meetup.com/coderplex/events?desc=1&photo-host=public&page=20&sig_id=216741149&status=past&only=id%2Cname%2Ctime%2Cyes_rsvp_count%2Cdescription%2Cvenue%2Cstatus%2Clink&sig=9c90b0db31ddca7bad153c802491c36295eb3170';
33

44
export const futureEventsMeetupURL =
5-
'https://api.meetup.com/freeCodeCamp-Hyderabad/events?photo-host=public&page=20&sig_id=216741149&status=upcoming&only=id%2Cname%2Ctime%2Cyes_rsvp_count%2Cdescription%2Cvenue%2Cstatus%2Clink&sig=7ced2a430897569cb38f1e27ac255be8d1aaa525';
5+
'https://api.meetup.com/coderplex/events?photo-host=public&page=20&sig_id=216741149&status=upcoming&only=id%2Cname%2Ctime%2Cyes_rsvp_count%2Cdescription%2Cvenue%2Cstatus%2Clink&sig=7ced2a430897569cb38f1e27ac255be8d1aaa525';
66

77
export const reverseProxyCORS = 'https://cors.now.sh/';

‎yarn.lock

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,16 @@ aws4@^1.2.1, aws4@^1.6.0:
315315
version "1.6.0"
316316
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
317317

318+
<<<<<<< HEAD
319+
=======
320+
axios@0.16.2:
321+
version "0.16.2"
322+
resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.2.tgz#ba4f92f17167dfbab40983785454b9ac149c3c6d"
323+
dependencies:
324+
follow-redirects "^1.2.3"
325+
is-buffer "^1.1.5"
326+
327+
>>>>>>> travis
318328
babel-code-frame@^6.16.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
319329
version "6.26.0"
320330
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy