fix dev.pinafore.social deployments in travis

This commit is contained in:
Nolan Lawson 2018-04-11 22:22:20 -07:00
parent 3fc42bdd4d
commit b7743c5816
2 changed files with 4 additions and 12 deletions

9
package-lock.json generated
View File

@ -4650,15 +4650,6 @@
} }
} }
}, },
"git-branch-is": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/git-branch-is/-/git-branch-is-0.1.0.tgz",
"integrity": "sha1-vvWmETow9AB+fAAvm6TPN5JcFx8=",
"dev": true,
"requires": {
"commander": "2.12.2"
}
},
"glob": { "glob": {
"version": "7.1.2", "version": "7.1.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",

View File

@ -24,9 +24,10 @@
"globalize-css": "node ./bin/globalize-css.js", "globalize-css": "node ./bin/globalize-css.js",
"deglobalize-css": "node ./bin/globalize-css.js --reverse", "deglobalize-css": "node ./bin/globalize-css.js --reverse",
"stage-dev": "printf 'User-agent: *\nDisallow: /' > assets/robots.txt", "stage-dev": "printf 'User-agent: *\nDisallow: /' > assets/robots.txt",
"deploy-dev": "git-branch-is master && npm run stage-dev && now && sleep 60 && now alias dev.pinafore.social && now rm pinafore --safe --yes", "deploy-dev": "npm run stage-dev && now && sleep 60 && now alias dev.pinafore.social && now rm pinafore --safe --yes",
"stage-prod": "rm -f assets/robots.txt", "stage-prod": "rm -f assets/robots.txt",
"deploy-prod": "git-branch-is master && npm run stage-prod && now && sleep 60 && now alias pinafore.social && now rm pinafore --safe --yes", "deploy-prod": "npm run stage-prod && now && sleep 60 && now alias pinafore.social && now rm pinafore --safe --yes",
"deploy-dev-travis": "if [[ $TRAVIS_BRANCH == master ]]; then npm run stage-dev && now --token $NOW_TOKEN && sleep 60 && now alias dev.pinafore.social --token $NOW_TOKEN && now rm pinafore --safe --yes; fi",
"backup-mastodon-data": "pg_dump -Fc mastodon_development > fixtures/dump.sql && cd mastodon/public/system && tar -czf ../../../fixtures/system.tgz ." "backup-mastodon-data": "pg_dump -Fc mastodon_development > fixtures/dump.sql && cd mastodon/public/system && tar -czf ../../../fixtures/system.tgz ."
}, },
"dependencies": { "dependencies": {
@ -79,7 +80,6 @@
"yargs": "^10.1.1" "yargs": "^10.1.1"
}, },
"devDependencies": { "devDependencies": {
"git-branch-is": "^0.1.0",
"now": "^10.2.2", "now": "^10.2.2",
"standard": "^10.0.3", "standard": "^10.0.3",
"testcafe": "^0.19.0" "testcafe": "^0.19.0"
@ -126,6 +126,7 @@
"cjs": "vars" "cjs": "vars"
}, },
"now": { "now": {
"type": "npm",
"env": { "env": {
"NODE_ENV": "production" "NODE_ENV": "production"
}, },