Merge pull request #75 from Staffbase/various-improvements

Staffbase · Jun 20, 2022 · 2df605a · 2df605a
2 parents 0619d50 + ef96d46
commit 2df605a
Show file tree

Hide file tree

Showing 7 changed files with 5,876 additions and 6,320 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -39,4 +39,3 @@ jobs:
         with:
           token: ${{ secrets.DEV_PUSH_TOKEN }}
           user: ${{ secrets.DEV_PUSH_USER }}
-          optimistic: true
diff --git a/README.md b/README.md
@@ -44,7 +44,6 @@ You can find all input options which are available for this action.
 | base            | This is the base branch. The merge history originates from this branch.                                                                                                                       | main                   |
 | branch          | The branch the action will merge the pull requests to.                                                                                                                                        | dev                    |
 | label           | The label where the action will be triggered.                                                                                                                                                 | dev                    |
-| optimistic      | Whether the action should perform an "optimistic" merge of the given Pull requests. If this is set to false, the dev branch is only built if there are zero merge conflicts between branches. | false                  |
 | comments        | The GitHub action creates a new comment inside every pull request.                                                                                                                            | false                  |
 | success_comment | Comment string that will be shown in the pull request on success. Only necessary if `comments` is enabled.                                                                                    | ''                     |
 | failure_comment | Comment string that will be shown in the pull request on failure. Only necessary if `comments` is enabled.                                                                                    | ''                     |
@@ -63,7 +62,6 @@ Always create the dev branch.
   uses: Staffbase/autodev-action@v1.4.0
   with:
     token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-    optimistic: true
 ```
 
 Add a status comment if the merge was successful or failed.

diff --git a/__test__/autodev.test.ts b/__test__/autodev.test.ts
@@ -48,8 +48,7 @@ describe('autodev', () => {
     jest
       .spyOn(core, 'getInput')
       .mockImplementation(
-        input =>
-          ({optimistic: 'true', token: 'token', base: 'main'}[input] || '')
+        input => ({token: 'token', base: 'main'}[input] || '')
       )
 
     await autoDev()
@@ -66,10 +65,7 @@ The following branches have been merged:
     jest
       .spyOn(core, 'getInput')
       .mockImplementation(
-        input =>
-          ({optimistic: 'true', token: 'token', base: 'main', comments: 'true'}[
-            input
-          ] || '')
+        input => ({token: 'token', base: 'main', comments: 'true'}[input] || '')
       )
 
     await autoDev()
@@ -81,10 +77,7 @@ The following branches have been merged:
     jest
       .spyOn(core, 'getInput')
       .mockImplementation(
-        input =>
-          ({optimistic: 'true', token: 'token', base: 'main', labels: 'true'}[
-            input
-          ] || '')
+        input => ({token: 'token', base: 'main', labels: 'true'}[input] || '')
       )
 
     await autoDev()

diff --git a/action.yml b/action.yml
@@ -22,10 +22,6 @@ inputs:
     required: false
     default: 'dev'
     description: 'The branch the action will merge the Pull Requests to.'
-  optimistic:
-    required: false
-    default: 'true'
-    description: 'Ignores conflicts between branches and merges the remaining branches.'
   comments:
     required: false
     default: 'false'