diff --git a/.github/workflows/benchmark-command.yml b/.github/workflows/benchmark.yml similarity index 92% rename from .github/workflows/benchmark-command.yml rename to .github/workflows/benchmark.yml index 08e9816d69b..114b1112abb 100644 --- a/.github/workflows/benchmark-command.yml +++ b/.github/workflows/benchmark.yml @@ -1,7 +1,12 @@ name: Run Benchmarks on: - workflow_dispatch: + workflow_dispatch: + pull_request: + types: [labeled, synchronize, opened, reopened] + branches: + - main + - releases jobs: benchmark: @@ -35,7 +40,6 @@ jobs: env: BASE_BRANCH: ${{ github.event.pull_request.base.ref }} GITHUB_BRANCH_NAME: ${{ steps.branch-name.outputs.current_branch }} - id: check_runtime if: contains( github.event.pull_request.labels.*.name, 'needs-benchmarks') run: .maintain/check_runtime.sh @@ -44,7 +48,6 @@ jobs: env: BASE_BRANCH: ${{ github.event.pull_request.base.ref }} GITHUB_BRANCH_NAME: ${{ steps.branch-name.outputs.current_branch }} - if: env.RUNTIME_CHECK == 1 id: run_benchmarks run: .maintain/run_benchmarks.sh diff --git a/.github/workflows/simnode-command.yml b/.github/workflows/simnode.yml similarity index 87% rename from .github/workflows/simnode-command.yml rename to .github/workflows/simnode.yml index 966672f49a2..76efb18754b 100644 --- a/.github/workflows/simnode-command.yml +++ b/.github/workflows/simnode.yml @@ -2,6 +2,11 @@ name: Run Simnode on: workflow_dispatch: + pull_request: + types: [ labeled, synchronize, opened, reopened ] + branches: + - main + - releases jobs: simnode: @@ -31,16 +36,16 @@ jobs: - name: Check for runtime changes id: check_runtime + if: contains( github.event.pull_request.labels.*.name, 'needs-simnode') env: BASE_BRANCH: ${{ github.event.pull_request.base.ref }} GITHUB_BRANCH_NAME: ${{ steps.branch-name.outputs.current_branch }} - run: .maintain/check_runtime.sh - name: Run Simnode env: BASE_BRANCH: ${{ github.event.pull_request.base.ref }} GITHUB_BRANCH_NAME: ${{ steps.branch-name.outputs.current_branch }} - if: contains( github.event.pull_request.labels.*.name, 'needs-simnode') && env.RUNTIME_CHECK == 1 + if: env.RUNTIME_CHECK == 1 id: run_simnode run: .maintain/run_simnode.sh diff --git a/.github/workflows/slash.yml b/.github/workflows/slash.yml deleted file mode 100644 index f8c0e177573..00000000000 --- a/.github/workflows/slash.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Run Ansible Playbooks - -on: - issue_comment: - types: [created] - -jobs: - run-playbooks: - runs-on: - - self-hosted - - linux - - X64 - - sre - - steps: - - name: Run Simnode - uses: peter-evans/slash-command-dispatch@v2 - with: - token: ${{ secrets.COMPOSABLE_GITHUB_TOKEN }} - commands: | - simnode - benchmark - dispatch-type: workflow - - \ No newline at end of file