Merge pull request #508 from peter-evans/update-distribution

Update distribution

__test__/create-or-update-branch.int.test.ts

@@ -343,7 +343,7 @@ describe('create-or-update-branch tests', () => {
       REMOTE_NAME,
       false
     )
-    expect(_result.action).toEqual('none')
+    expect(_result.action).toEqual('not-updated')
     expect(await getFileContent(TRACKED_FILE)).toEqual(changes.tracked)
     expect(await getFileContent(UNTRACKED_FILE)).toEqual(changes.untracked)
     expect(
@@ -993,7 +993,7 @@ describe('create-or-update-branch tests', () => {
       REMOTE_NAME,
       false
     )
-    expect(_result.action).toEqual('none')
+    expect(_result.action).toEqual('not-updated')
     expect(await getFileContent(TRACKED_FILE)).toEqual(changes.tracked)
     expect(await getFileContent(UNTRACKED_FILE)).toEqual(changes.untracked)
     expect(

dist/index.js

@@ -1393,6 +1393,7 @@ function createOrUpdateBranch(git, commitMessage, base, branch, branchRemoteName
                 core.info(`Updated branch '${branch}'`);
             }
             else {
+                result.action = 'not-updated';
                 core.info(`Branch '${branch}' is even with its remote and will not be updated`);
             }
             // Check if the pull request branch is ahead of the base
@@ -7718,14 +7719,16 @@ function createPullRequest(inputs) {
                     `HEAD:refs/heads/${inputs.branch}`
                 ]);
                 core.endGroup();
-                // Set the base. It would have been '' if not specified as an input
+            }
-                inputs.base = result.base;
+            // Set the base. It would have been '' if not specified as an input
-                if (result.hasDiffWithBase) {
+            inputs.base = result.base;
-                    // Create or update the pull request
+            if (result.hasDiffWithBase) {
-                    yield githubHelper.createOrUpdatePullRequest(inputs, baseRemote.repository, branchRepository);
+                // Create or update the pull request
-                }
+                yield githubHelper.createOrUpdatePullRequest(inputs, baseRemote.repository, branchRepository);
-                else {
+            }
-                    // If there is no longer a diff with the base delete the branch
+            else {
+                // If there is no longer a diff with the base delete the branch
+                if (['updated', 'not-updated'].includes(result.action)) {
                     core.info(`Branch '${inputs.branch}' no longer differs from base branch '${inputs.base}'`);
                     core.info(`Closing pull request and deleting branch '${inputs.branch}'`);
                     yield git.push([

src/create-or-update-branch.ts

@@ -178,6 +178,7 @@ export async function createOrUpdateBranch(
       result.action = 'updated'
       core.info(`Updated branch '${branch}'`)
     } else {
+      result.action = 'not-updated'
       core.info(
         `Branch '${branch}' is even with its remote and will not be updated`
       )

src/create-pull-request.ts

@@ -185,19 +185,21 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
         `HEAD:refs/heads/${inputs.branch}`
       ])
       core.endGroup()
+    }
 
-      // Set the base. It would have been '' if not specified as an input
+    // Set the base. It would have been '' if not specified as an input
-      inputs.base = result.base
+    inputs.base = result.base
 
-      if (result.hasDiffWithBase) {
+    if (result.hasDiffWithBase) {
-        // Create or update the pull request
+      // Create or update the pull request
-        await githubHelper.createOrUpdatePullRequest(
+      await githubHelper.createOrUpdatePullRequest(
-          inputs,
+        inputs,
-          baseRemote.repository,
+        baseRemote.repository,
-          branchRepository
+        branchRepository
-        )
+      )
-      } else {
+    } else {
-        // If there is no longer a diff with the base delete the branch
+      // If there is no longer a diff with the base delete the branch
+      if (['updated', 'not-updated'].includes(result.action)) {
         core.info(
           `Branch '${inputs.branch}' no longer differs from base branch '${inputs.base}'`
         )