From 05724e0d1844f1a6684ac9b7a3ea2f17d118d735 Mon Sep 17 00:00:00 2001 From: Angel Dimitrov Date: Fri, 23 Aug 2024 16:07:05 +0300 Subject: [PATCH] OXDEV-8573 Remove EE job from trigger --- .github/oxid-esales/module-usercentrics.yaml | 2 +- .github/workflows/dispatch_module.yaml | 16 +--------------- .github/workflows/trigger.yaml | 16 +--------------- 3 files changed, 3 insertions(+), 31 deletions(-) diff --git a/.github/oxid-esales/module-usercentrics.yaml b/.github/oxid-esales/module-usercentrics.yaml index cbb5513..2cee844 100644 --- a/.github/oxid-esales/module-usercentrics.yaml +++ b/.github/oxid-esales/module-usercentrics.yaml @@ -71,4 +71,4 @@ styles: module_ids: *ids finish: - slack_title: 'Module {{ print $name }} {{ .Github.RefName}} on {{ .Github.Repository }} by {{ .Github.Actor }}' \ No newline at end of file + slack_title: 'Module {{ print $name }} {{ .Github.RefName }} on {{ .Github.Repository }} by {{ .Github.Actor }}' \ No newline at end of file diff --git a/.github/workflows/dispatch_module.yaml b/.github/workflows/dispatch_module.yaml index eb663f5..f5ceaf2 100644 --- a/.github/workflows/dispatch_module.yaml +++ b/.github/workflows/dispatch_module.yaml @@ -42,18 +42,4 @@ jobs: CACHE_SECRET_KEY: ${{ secrets.CACHE_SECRET_KEY }} enterprise_github_token: ${{ secrets.enterprise_github_token }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - - pull_module_ee: - runs-on: ubuntu-latest - steps: - - name: Trigger EE workflow and wait for results - uses: convictional/trigger-workflow-and-wait@v1.6.5 - with: - owner: oxid-esales - repo: module-workflows - github_user: ${{ secrets.CI_USER }} - github_token: ${{ secrets.GH_CI_JENKINS_TOKEN }} - workflow_file_name: evat_workflow.yaml - ref: "b-7.1.x" - client_payload: "{\"php\": \"8.2\", \"mysql\": \"8.0\", \"edition\": \"ee\", \"ref\": \"${{ github.ref_name }}\"}" \ No newline at end of file + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} \ No newline at end of file diff --git a/.github/workflows/trigger.yaml b/.github/workflows/trigger.yaml index e160e36..7d9f983 100644 --- a/.github/workflows/trigger.yaml +++ b/.github/workflows/trigger.yaml @@ -22,18 +22,4 @@ jobs: CACHE_SECRET_KEY: ${{ secrets.CACHE_SECRET_KEY }} enterprise_github_token: ${{ secrets.enterprise_github_token }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - - pull_module_ee: - runs-on: ubuntu-latest - steps: - - name: Trigger EE workflow and wait for results - uses: convictional/trigger-workflow-and-wait@v1.6.5 - with: - owner: oxid-esales - repo: module-workflows - github_user: ${{ secrets.CI_USER }} - github_token: ${{ secrets.GH_CI_JENKINS_TOKEN }} - workflow_file_name: evat_workflow.yaml - ref: "b-7.1.x" - client_payload: "{\"php\": \"8.2\", \"mysql\": \"8.0\", \"edition\": \"ee\", \"ref\": \"${{ github.ref_name }}\"}" \ No newline at end of file + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} \ No newline at end of file