From 9eb3f3d67ff8bee8ef4eff9728d39c120ec77faa Mon Sep 17 00:00:00 2001 From: tharindu1st Date: Mon, 11 Dec 2023 22:43:13 +0530 Subject: [PATCH] fix merge run --- .github/workflows/adapter-release.yml | 2 +- .github/workflows/admin-domain-service-release.yml | 2 +- .github/workflows/backoffice-release.yml | 2 +- .github/workflows/common-controller-release.yml | 2 +- .github/workflows/config-deployer-release.yml | 2 +- .github/workflows/devportal-domain-service-release.yml | 2 +- .github/workflows/enforcer-release.yml | 2 +- .github/workflows/idp-domain-service-release.yml | 2 +- .github/workflows/idp-ui-release.yml | 2 +- .github/workflows/management-server-release.yml | 2 +- .github/workflows/ratelimiter-release.yml | 2 +- .github/workflows/router-release.yml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/adapter-release.yml b/.github/workflows/adapter-release.yml index 50e0bb009..a23886c55 100644 --- a/.github/workflows/adapter-release.yml +++ b/.github/workflows/adapter-release.yml @@ -66,7 +66,7 @@ jobs: git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }} - name: checkout pull request and merge. shell: sh - if: github.event_name == 'workflow_call' + if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action') run: | cd apk-repo gh pr checkout ${{ github.event.number }} -b pr-${{ github.event.number }} diff --git a/.github/workflows/admin-domain-service-release.yml b/.github/workflows/admin-domain-service-release.yml index 7468e9ad1..1a380489a 100644 --- a/.github/workflows/admin-domain-service-release.yml +++ b/.github/workflows/admin-domain-service-release.yml @@ -82,7 +82,7 @@ jobs: git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }} - name: checkout pull request and merge. shell: sh - if: github.event_name == 'workflow_call' + if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action') run: | cd apk-repo gh pr checkout ${{ github.event.number }} -b pr-${{ github.event.number }} diff --git a/.github/workflows/backoffice-release.yml b/.github/workflows/backoffice-release.yml index 4941b37a5..113e6dadd 100644 --- a/.github/workflows/backoffice-release.yml +++ b/.github/workflows/backoffice-release.yml @@ -82,7 +82,7 @@ jobs: git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }} - name: checkout pull request and merge. shell: sh - if: github.event_name == 'workflow_call' + if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action') run: | cd apk-repo gh pr checkout ${{ github.event.number }} -b pr-${{ github.event.number }} diff --git a/.github/workflows/common-controller-release.yml b/.github/workflows/common-controller-release.yml index 234a30ff5..1b0b3815c 100644 --- a/.github/workflows/common-controller-release.yml +++ b/.github/workflows/common-controller-release.yml @@ -66,7 +66,7 @@ jobs: git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }} - name: checkout pull request and merge. shell: sh - if: github.event_name == 'workflow_call' + if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action') run: | cd apk-repo gh pr checkout ${{ github.event.number }} -b pr-${{ github.event.number }} diff --git a/.github/workflows/config-deployer-release.yml b/.github/workflows/config-deployer-release.yml index e952c10af..fc8c1284a 100644 --- a/.github/workflows/config-deployer-release.yml +++ b/.github/workflows/config-deployer-release.yml @@ -82,7 +82,7 @@ jobs: git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }} - name: checkout pull request and merge. shell: sh - if: github.event_name == 'workflow_call' + if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action') run: | cd apk-repo gh pr checkout ${{ github.event.number }} -b pr-${{ github.event.number }} diff --git a/.github/workflows/devportal-domain-service-release.yml b/.github/workflows/devportal-domain-service-release.yml index 6d485b7c8..de78f76c8 100644 --- a/.github/workflows/devportal-domain-service-release.yml +++ b/.github/workflows/devportal-domain-service-release.yml @@ -82,7 +82,7 @@ jobs: git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }} - name: checkout pull request and merge. shell: sh - if: github.event_name == 'workflow_call' + if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action') run: | cd apk-repo gh pr checkout ${{ github.event.number }} -b pr-${{ github.event.number }} diff --git a/.github/workflows/enforcer-release.yml b/.github/workflows/enforcer-release.yml index efccdb793..5417cd771 100644 --- a/.github/workflows/enforcer-release.yml +++ b/.github/workflows/enforcer-release.yml @@ -66,7 +66,7 @@ jobs: git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }} - name: checkout pull request and merge. shell: sh - if: github.event_name == 'workflow_call' + if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action') run: | cd apk-repo gh pr checkout ${{ github.event.number }} -b pr-${{ github.event.number }} diff --git a/.github/workflows/idp-domain-service-release.yml b/.github/workflows/idp-domain-service-release.yml index 836ea564c..74239a67c 100644 --- a/.github/workflows/idp-domain-service-release.yml +++ b/.github/workflows/idp-domain-service-release.yml @@ -81,7 +81,7 @@ jobs: git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }} - name: checkout pull request and merge. shell: sh - if: github.event_name == 'workflow_call' + if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action') run: | cd apk-repo gh pr checkout ${{ github.event.number }} -b pr-${{ github.event.number }} diff --git a/.github/workflows/idp-ui-release.yml b/.github/workflows/idp-ui-release.yml index 6d2311d0f..35265ba7c 100644 --- a/.github/workflows/idp-ui-release.yml +++ b/.github/workflows/idp-ui-release.yml @@ -58,7 +58,7 @@ jobs: git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }} - name: checkout pull request and merge. shell: sh - if: github.event_name == 'workflow_call' + if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action') run: | cd apk-repo gh pr checkout ${{ github.event.number }} -b pr-${{ github.event.number }} diff --git a/.github/workflows/management-server-release.yml b/.github/workflows/management-server-release.yml index ec3ef410d..717f0aa4b 100644 --- a/.github/workflows/management-server-release.yml +++ b/.github/workflows/management-server-release.yml @@ -67,7 +67,7 @@ jobs: git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }} - name: checkout pull request and merge. shell: sh - if: github.event_name == 'workflow_call' + if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action') run: | cd apk-repo gh pr checkout ${{ github.event.number }} -b pr-${{ github.event.number }} diff --git a/.github/workflows/ratelimiter-release.yml b/.github/workflows/ratelimiter-release.yml index c31b8b169..4fa5612a6 100644 --- a/.github/workflows/ratelimiter-release.yml +++ b/.github/workflows/ratelimiter-release.yml @@ -66,7 +66,7 @@ jobs: git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }} - name: checkout pull request and merge. shell: sh - if: github.event_name == 'workflow_call' + if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action') run: | cd apk-repo gh pr checkout ${{ github.event.number }} -b pr-${{ github.event.number }} diff --git a/.github/workflows/router-release.yml b/.github/workflows/router-release.yml index 4b5b5b94d..d172dae91 100644 --- a/.github/workflows/router-release.yml +++ b/.github/workflows/router-release.yml @@ -59,7 +59,7 @@ jobs: git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }} - name: checkout pull request and merge. shell: sh - if: github.event_name == 'workflow_call' + if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action') run: | cd apk-repo gh pr checkout ${{ github.event.number }} -b pr-${{ github.event.number }}