From 8622b37ff0052c105253f8d503b2681a118b3cef Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Thu, 12 Apr 2018 21:01:24 -0700 Subject: [PATCH] travis: only deploy to dev.pinafore.social on non-PRs --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2e2ac24..2590545 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "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", "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 --team nolanlawson && sleep 60 && now alias dev.pinafore.social --token $NOW_TOKEN --team nolanlawson && now rm pinafore --safe --yes --token $NOW_TOKEN --team nolanlawson; fi", + "deploy-dev-travis": "if [ $TRAVIS_BRANCH = master -a $TRAVIS_PULL_REQUEST = false ]; then npm run stage-dev && now --token $NOW_TOKEN --team nolanlawson && sleep 60 && now alias dev.pinafore.social --token $NOW_TOKEN --team nolanlawson && now rm pinafore --safe --yes --token $NOW_TOKEN --team nolanlawson; fi", "backup-mastodon-data": "pg_dump -Fc mastodon_development > fixtures/dump.sql && cd mastodon/public/system && tar -czf ../../../fixtures/system.tgz ." }, "dependencies": {