Merge pull request #704 from jonico/support-ghes

Support GitHub Enterprise Server

package.json

@@ -31,24 +31,24 @@
   "dependencies": {
     "@actions/core": "1.2.6",
     "@actions/exec": "1.0.4",
-    "@octokit/core": "3.1.2",
+    "@octokit/core": "3.2.4",
-    "@octokit/plugin-paginate-rest": "2.4.0",
+    "@octokit/plugin-paginate-rest": "2.8.0",
-    "@octokit/plugin-rest-endpoint-methods": "4.2.0",
+    "@octokit/plugin-rest-endpoint-methods": "4.5.2",
-    "uuid": "8.3.0"
+    "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@types/jest": "26.0.14",
+    "@types/jest": "26.0.20",
-    "@types/node": "14.10.3",
+    "@types/node": "14.14.22",
-    "@typescript-eslint/parser": "4.1.1",
+    "@typescript-eslint/parser": "4.14.0",
-    "@vercel/ncc": "0.24.1",
+    "@vercel/ncc": "0.27.0",
-    "eslint": "7.9.0",
+    "eslint": "7.18.0",
     "eslint-plugin-github": "4.1.1",
-    "eslint-plugin-jest": "24.0.1",
+    "eslint-plugin-jest": "24.1.3",
-    "jest": "26.4.2",
+    "jest": "26.6.3",
-    "jest-circus": "26.4.2",
+    "jest-circus": "26.6.3",
-    "js-yaml": "3.14.0",
+    "js-yaml": "4.0.0",
-    "prettier": "2.1.2",
+    "prettier": "2.2.1",
-    "ts-jest": "26.3.0",
+    "ts-jest": "26.4.4",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   }
 }

src/create-or-update-branch.ts

@@ -130,8 +130,18 @@ export async function createOrUpdateBranch(
   // Perform fetch and reset the working base
   // Commits made during the workflow will be removed
   if (workingBaseType == WorkingBaseType.Branch) {
-    core.info(`Resetting working base branch '${workingBase}' to its remote`)
+    core.info(`Resetting working base branch '${workingBase}'`)
-    await git.fetch([`${workingBase}:${workingBase}`], baseRemote, ['--force'])
+    if (branchRemoteName == 'fork') {
+      // If pushing to a fork we must fetch with 'unshallow' to avoid the following error on git push
+      // ! [remote rejected] HEAD -> tests/push-branch-to-fork (shallow update not allowed)
+      await git.fetch([`${workingBase}:${workingBase}`], baseRemote, [
+        '--force'
+      ])
+    } else {
+      // If the remote is 'origin' we can git reset
+      await git.checkout(workingBase)
+      await git.exec(['reset', '--hard', `${baseRemote}/${workingBase}`])
+    }
   }
 
   // If the working base is not the base, rebase the temp branch commits
@@ -168,7 +178,7 @@ export async function createOrUpdateBranch(
     // The pull request branch does not exist
     core.info(`Pull request branch '${branch}' does not exist yet.`)
     // Create the pull request branch
-    await git.checkout(branch, 'HEAD')
+    await git.checkout(branch, tempBranch)
     // Check if the pull request branch is ahead of the base
     result.hasDiffWithBase = await isAhead(git, base, branch)
     if (result.hasDiffWithBase) {

src/create-pull-request.ts

@@ -106,6 +106,12 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
         `The 'base' and 'branch' for a pull request must be different branches. Unable to continue.`
       )
     }
+    // For self-hosted runners the repository state persists between runs.
+    // This command prunes the stale remote ref when the pull request branch was
+    // deleted after being merged or closed. Without this the push using
+    // '--force-with-lease' fails due to "stale info."
+    // https://github.com/peter-evans/create-pull-request/issues/633
+    await git.exec(['remote', 'prune', branchRemoteName])
     core.endGroup()
 
     // Apply the branch suffix if set

src/github-helper.ts

@@ -23,6 +23,7 @@ export class GitHubHelper {
     if (token) {
       options.auth = `${token}`
     }
+    options.baseUrl = process.env['GITHUB_API_URL'] || 'https://api.github.com'
     this.octokit = new Octokit(options)
   }
 
@@ -58,9 +59,11 @@ export class GitHubHelper {
       }
     } catch (e) {
       if (
-        !e.message ||
+        e.message &&
-        !e.message.includes(`A pull request already exists for ${headBranch}`)
+        e.message.includes(`A pull request already exists for ${headBranch}`)
       ) {
+        core.info(`A pull request already exists for ${headBranch}`)
+      } else {
         throw e
       }
     }

src/utils.ts

@@ -39,8 +39,21 @@ interface RemoteDetail {
 export function getRemoteDetail(remoteUrl: string): RemoteDetail {
   // Parse the protocol and github repository from a URL
   // e.g. HTTPS, peter-evans/create-pull-request
-  const httpsUrlPattern = /^https:\/\/.*@?github.com\/(.+\/.+)$/i
+  const githubUrl = process.env['GITHUB_SERVER_URL'] || 'https://github.com'
-  const sshUrlPattern = /^git@github.com:(.+\/.+).git$/i
+
+  const githubServerMatch = githubUrl.match(/^https?:\/\/(.+)$/i)
+  if (!githubServerMatch) {
+    throw new Error('Could not parse GitHub Server name')
+  }
+
+  const httpsUrlPattern = new RegExp(
+    '^https?://.*@?' + githubServerMatch[1] + '/(.+/.+)$',
+    'i'
+  )
+  const sshUrlPattern = new RegExp(
+    '^git@' + githubServerMatch[1] + ':(.+/.+).git$',
+    'i'
+  )
 
   const httpsMatch = remoteUrl.match(httpsUrlPattern)
   if (httpsMatch) {