Merge pull request #2125 from atom/aw/no-ref-on-master

smashwilson · web-flow · commit 236bebb96360 · 2019-05-06T13:51:09.000-04:00
Default upstream refspec to master
diff --git a/.github/main.workflow b/.github/main.workflow
@@ -1,6 +1,6 @@
 workflow "GraphQL schema update" {
-  // Every Monday at 1am.
-  on = "schedule(0 1 * * 1)"
+  // Every Tuesday at 1am.
+  on = "schedule(0 1 * * 2)"
   resolves = "Update schema"
 }
 
diff --git a/actions/schema-up/index.js b/actions/schema-up/index.js
@@ -42,7 +42,7 @@ Toolkit.run(async tools => {
 
   if (hasRelayChanges === 0 && !relayFailed) {
     tools.log.info('Generated relay files are unchanged.');
-    const upstream = tools.context.ref.replace(/^refs\/heads\//, '');
+    const upstream = tools.context.ref || 'master';
     await tools.runInWorkspace('git', ['push', 'origin', upstream]);
     tools.exit.success('Schema is up to date on master.');
   }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`workflow "GraphQL schema update" {`
`2`		`- // Every Monday at 1am.`
`3`		`- on = "schedule(0 1 * * 1)"`
	`2`	`+ // Every Tuesday at 1am.`
	`3`	`+ on = "schedule(0 1 * * 2)"`
`4`	`4`	`resolves = "Update schema"`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ Toolkit.run(async tools => {`
`42`	`42`
`43`	`43`	`if (hasRelayChanges === 0 && !relayFailed) {`
`44`	`44`	`tools.log.info('Generated relay files are unchanged.');`
`45`		`- const upstream = tools.context.ref.replace(/^refs\/heads\//, '');`
	`45`	`+ const upstream = tools.context.ref \|\| 'master';`
`46`	`46`	`await tools.runInWorkspace('git', ['push', 'origin', upstream]);`
`47`	`47`	`tools.exit.success('Schema is up to date on master.');`
`48`	`48`	`}`