From 6fc0bfc3f40e64aa48d8bf19a04e2cc056e81710 Mon Sep 17 00:00:00 2001 From: 0katrinpetrosyan0 Date: Mon, 13 Jun 2022 13:28:49 +0400 Subject: [PATCH 01/11] DMVP-739 have some variables changes --- terraform/action.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/terraform/action.yml b/terraform/action.yml index 098f21c..587212c 100644 --- a/terraform/action.yml +++ b/terraform/action.yml @@ -38,7 +38,7 @@ inputs: description: "Variable file" required: false default: "env.tfvars" - post-plan-to-github-pr: + is-pr: description: "Allows to disable plan result posting into github PR as comment" required: false default: "true" @@ -46,10 +46,6 @@ inputs: description: "Allows to enable plan result direct apply" required: false default: "false" - target_branch: - description: 'The name of target branch to merge' - required: false - default: "master" runs: using: "composite" @@ -60,7 +56,7 @@ runs: fetch-depth: ${{ inputs.fetch-depth }} - name: Merge branches - if: ${{inputs.target_branch}} + if: ${{ github.event.pull_request.base.ref }} && ${{inputs.is-pr == 'true'}} uses: devmasx/merge-branch@master with: type: now @@ -113,7 +109,7 @@ runs: shell: bash - name: Post Plan to GitHub PR - if: ${{inputs.post-plan-to-github-pr == 'true'}} + if: ${{inputs.is-pr == 'true'}} uses: mshick/add-pr-comment@v1 with: repo-token: ${{ inputs.github-token }} From c5ed7aed7c7642e9e24adb5fca862ad00a06bf24 Mon Sep 17 00:00:00 2001 From: 0katrinpetrosyan0 Date: Mon, 13 Jun 2022 13:44:25 +0400 Subject: [PATCH 02/11] DMVP-739 have some variable changes --- terraform/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/action.yml b/terraform/action.yml index 587212c..ddafce0 100644 --- a/terraform/action.yml +++ b/terraform/action.yml @@ -56,11 +56,11 @@ runs: fetch-depth: ${{ inputs.fetch-depth }} - name: Merge branches - if: ${{ github.event.pull_request.base.ref }} && ${{inputs.is-pr == 'true'}} + if: ${{inputs.is-pr == 'true'}} uses: devmasx/merge-branch@master with: type: now - target_branch: ${{ inputs.target_branch }} + target_branch: ${{ github.event.pull_request.base.ref }} github_token: ${{ inputs.github_token }} - uses: marceloprado/has-changed-path@v1 From 82a064f9d29bc4f7abb9b25914fc2105665f3c33 Mon Sep 17 00:00:00 2001 From: 0katrinpetrosyan0 Date: Mon, 13 Jun 2022 14:19:15 +0400 Subject: [PATCH 03/11] DMVP-739 have some variable changes --- terraform/action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/action.yml b/terraform/action.yml index ddafce0..4d21996 100644 --- a/terraform/action.yml +++ b/terraform/action.yml @@ -57,11 +57,11 @@ runs: - name: Merge branches if: ${{inputs.is-pr == 'true'}} - uses: devmasx/merge-branch@master + uses: everlytic/branch-merge@1.1.2 with: - type: now - target_branch: ${{ github.event.pull_request.base.ref }} github_token: ${{ inputs.github_token }} + source_ref: ${{ github.ref }} + target_branch: ${{ github.event.pull_request.base.ref }} - uses: marceloprado/has-changed-path@v1 id: changed From 1c6494a06615f0b5048a9db91675c702233fe0a0 Mon Sep 17 00:00:00 2001 From: 0katrinpetrosyan0 Date: Mon, 13 Jun 2022 14:22:52 +0400 Subject: [PATCH 04/11] DMVP-739 have some variable changes --- terraform/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/action.yml b/terraform/action.yml index 4d21996..fd242c7 100644 --- a/terraform/action.yml +++ b/terraform/action.yml @@ -59,7 +59,7 @@ runs: if: ${{inputs.is-pr == 'true'}} uses: everlytic/branch-merge@1.1.2 with: - github_token: ${{ inputs.github_token }} + github_token: ${{ inputs.github-token }} source_ref: ${{ github.ref }} target_branch: ${{ github.event.pull_request.base.ref }} From b4f3499eebc9456c46ba46de2a71d0c8fc9d80b5 Mon Sep 17 00:00:00 2001 From: 0katrinpetrosyan0 Date: Mon, 13 Jun 2022 14:25:36 +0400 Subject: [PATCH 05/11] DMVP-739 have some variable changes --- terraform/action.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/terraform/action.yml b/terraform/action.yml index fd242c7..7bda4c0 100644 --- a/terraform/action.yml +++ b/terraform/action.yml @@ -57,11 +57,13 @@ runs: - name: Merge branches if: ${{inputs.is-pr == 'true'}} - uses: everlytic/branch-merge@1.1.2 + uses: devmasx/merge-branch@master with: - github_token: ${{ inputs.github-token }} + type: now source_ref: ${{ github.ref }} target_branch: ${{ github.event.pull_request.base.ref }} + github_token: ${{ inputs.github-token }} + - uses: marceloprado/has-changed-path@v1 id: changed From cc566ec49ccd2d87756b072b6bdfd715580efb99 Mon Sep 17 00:00:00 2001 From: 0katrinpetrosyan0 Date: Mon, 13 Jun 2022 14:27:21 +0400 Subject: [PATCH 06/11] DMVP-739 have some variable changes --- terraform/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/action.yml b/terraform/action.yml index 7bda4c0..ce6282b 100644 --- a/terraform/action.yml +++ b/terraform/action.yml @@ -60,7 +60,7 @@ runs: uses: devmasx/merge-branch@master with: type: now - source_ref: ${{ github.ref }} + from_branch: ${{ github.ref }} target_branch: ${{ github.event.pull_request.base.ref }} github_token: ${{ inputs.github-token }} From ab5909ba25817be9dbf9d08dac42073148f0b687 Mon Sep 17 00:00:00 2001 From: 0katrinpetrosyan0 Date: Mon, 13 Jun 2022 14:29:10 +0400 Subject: [PATCH 07/11] DMVP-739 have some variable changes --- terraform/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/action.yml b/terraform/action.yml index ce6282b..dbb35f9 100644 --- a/terraform/action.yml +++ b/terraform/action.yml @@ -60,7 +60,7 @@ runs: uses: devmasx/merge-branch@master with: type: now - from_branch: ${{ github.ref }} + head_to_merge: ${{ github.ref }} target_branch: ${{ github.event.pull_request.base.ref }} github_token: ${{ inputs.github-token }} From e90ab706891182fd83d4e995d379947ec6b21ab2 Mon Sep 17 00:00:00 2001 From: 0katrinpetrosyan0 Date: Mon, 13 Jun 2022 14:31:20 +0400 Subject: [PATCH 08/11] DMVP-739 have some variable changes --- terraform/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/terraform/action.yml b/terraform/action.yml index dbb35f9..fce36e5 100644 --- a/terraform/action.yml +++ b/terraform/action.yml @@ -60,7 +60,6 @@ runs: uses: devmasx/merge-branch@master with: type: now - head_to_merge: ${{ github.ref }} target_branch: ${{ github.event.pull_request.base.ref }} github_token: ${{ inputs.github-token }} From b4391f02bfa268a7ee0a63c8d4b79f687f45805a Mon Sep 17 00:00:00 2001 From: 0katrinpetrosyan0 Date: Mon, 13 Jun 2022 14:49:24 +0400 Subject: [PATCH 09/11] DMVP-739 have some variable changes --- terraform/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/terraform/action.yml b/terraform/action.yml index fce36e5..d34e0c4 100644 --- a/terraform/action.yml +++ b/terraform/action.yml @@ -62,8 +62,7 @@ runs: type: now target_branch: ${{ github.event.pull_request.base.ref }} github_token: ${{ inputs.github-token }} - - + - uses: marceloprado/has-changed-path@v1 id: changed with: From 701b65a05f52e60ccd954efdd8c04ddb1fd8a9f3 Mon Sep 17 00:00:00 2001 From: 0katrinpetrosyan0 Date: Mon, 13 Jun 2022 15:01:30 +0400 Subject: [PATCH 10/11] DMVP-739 have some variable change --- terraform/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/action.yml b/terraform/action.yml index d34e0c4..ddafce0 100644 --- a/terraform/action.yml +++ b/terraform/action.yml @@ -61,8 +61,8 @@ runs: with: type: now target_branch: ${{ github.event.pull_request.base.ref }} - github_token: ${{ inputs.github-token }} - + github_token: ${{ inputs.github_token }} + - uses: marceloprado/has-changed-path@v1 id: changed with: From e46144d9361f04453ee613979b1ec36930f76e08 Mon Sep 17 00:00:00 2001 From: 0katrinpetrosyan0 Date: Mon, 13 Jun 2022 15:05:29 +0400 Subject: [PATCH 11/11] DMVP-739 have some variable change --- terraform/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/action.yml b/terraform/action.yml index ddafce0..489a2af 100644 --- a/terraform/action.yml +++ b/terraform/action.yml @@ -61,7 +61,7 @@ runs: with: type: now target_branch: ${{ github.event.pull_request.base.ref }} - github_token: ${{ inputs.github_token }} + github_token: ${{ inputs.github-token }} - uses: marceloprado/has-changed-path@v1 id: changed