Merge branch 'master' into beta

lib/get-config.js

@@ -93,6 +93,6 @@ module.exports = async (context, opts) => {
 };
 
 async function pkgRepoUrl(opts) {
-  const {pkg} = await readPkgUp(opts);
+  const {package: pkg} = (await readPkgUp(opts)) || {};
   return pkg && (isPlainObject(pkg.repository) ? pkg.repository.url : pkg.repository);
 }

lib/get-git-auth-url.js

@@ -3,16 +3,6 @@ const {isNil} = require('lodash');
 const hostedGitInfo = require('hosted-git-info');
 const {verifyAuth} = require('./git');
 
-const GIT_TOKENS = {
-  GIT_CREDENTIALS: undefined,
-  GH_TOKEN: undefined,
-  GITHUB_TOKEN: undefined,
-  GL_TOKEN: 'gitlab-ci-token:',
-  GITLAB_TOKEN: 'gitlab-ci-token:',
-  BB_TOKEN: 'x-token-auth:',
-  BITBUCKET_TOKEN: 'x-token-auth:',
-};
-
 /**
  * Determine the the git repository URL to use to push, either:
  * - The `repositoryUrl` as is if allowed to push
@@ -25,6 +15,18 @@ const GIT_TOKENS = {
  * @return {String} The formatted Git repository URL.
  */
 module.exports = async ({cwd, env, branch, options: {repositoryUrl}}) => {
+  const GIT_TOKENS = {
+    GIT_CREDENTIALS: undefined,
+    GH_TOKEN: undefined,
+    // GitHub Actions require the "x-access-token:" prefix for git access
+    // https://developer.github.com/apps/building-github-apps/authenticating-with-github-apps/#http-based-git-access-by-an-installation
+    GITHUB_TOKEN: isNil(env.GITHUB_ACTION) ? undefined : 'x-access-token:',
+    GL_TOKEN: 'gitlab-ci-token:',
+    GITLAB_TOKEN: 'gitlab-ci-token:',
+    BB_TOKEN: 'x-token-auth:',
+    BITBUCKET_TOKEN: 'x-token-auth:',
+  };
+
   const info = hostedGitInfo.fromUrl(repositoryUrl, {noGitPlus: true});
   const {protocol, ...parsed} = parse(repositoryUrl);
 

lib/git.js

@@ -16,7 +16,7 @@ Object.assign(gitLogParser.fields, {hash: 'H', message: 'B', gitTags: 'd', commi
  */
 async function getTagHead(tagName, execaOpts) {
   try {
-    return await execa.stdout('git', ['rev-list', '-1', tagName], execaOpts);
+    return (await execa('git', ['rev-list', '-1', tagName], execaOpts)).stdout;
   } catch (error) {
     debug(error);
   }
@@ -31,7 +31,7 @@ async function getTagHead(tagName, execaOpts) {
  * @throws {Error} If the `git` command fails.
  */
 async function getTags(execaOpts) {
-  return (await execa.stdout('git', ['tag'], execaOpts))
+  return (await execa('git', ['tag'], execaOpts)).stdout
     .split('\n')
     .map(tag => tag.trim())
     .filter(Boolean);
@@ -167,8 +167,8 @@ async function fetch(repositoryUrl, branch, execaOpts) {
  *
  * @return {String} the sha of the HEAD commit.
  */
-function getGitHead(execaOpts) {
-  return execa.stdout('git', ['rev-parse', 'HEAD'], execaOpts);
+async function getGitHead(execaOpts) {
+  return (await execa('git', ['rev-parse', 'HEAD'], execaOpts)).stdout;
 }
 
 /**
@@ -180,7 +180,7 @@ function getGitHead(execaOpts) {
  */
 async function repoUrl(execaOpts) {
   try {
-    return await execa.stdout('git', ['config', '--get', 'remote.origin.url'], execaOpts);
+    return (await execa('git', ['config', '--get', 'remote.origin.url'], execaOpts)).stdout;
   } catch (error) {
     debug(error);
   }
@@ -286,7 +286,7 @@ async function verifyBranchName(branch, execaOpts) {
  * @return {Boolean} `true` is the HEAD of the current local branch is the same as the HEAD of the remote branch, falsy otherwise.
  */
 async function isBranchUpToDate(repositoryUrl, branch, execaOpts) {
-  const remoteHead = await execa.stdout('git', ['ls-remote', '--heads', repositoryUrl, branch], execaOpts);
+  const {stdout: remoteHead} = await execa('git', ['ls-remote', '--heads', repositoryUrl, branch], execaOpts);
   try {
     return await isRefInHistory(remoteHead.match(/^(\w+)?/)[1], branch, false, execaOpts);
   } catch (error) {