Removing ruby from dispatch-workflows.yml

diemol · diemol · commit e4f6dde928ca · 2022-03-03T11:27:06.000+01:00
diff --git a/.github/workflows/ci-ruby.yml b/.github/workflows/ci-ruby.yml
@@ -1,18 +1,34 @@
-name: Ruby workflow
+# Configuration for Ruby CI
+# To force the execution of this workflow, add [run ruby] to your commit message
+name: 'CI - Ruby'
 
 on:
   workflow_dispatch:
-  workflow_call:
+
   schedule:
     - cron: '35 9,21 * * *'
 
+  push:
+    branches:
+      - trunk
+  pull_request:
+    branches:
+      - trunk
+
 jobs:
+  check_workflow:
+    uses: ./.github/workflows/should-workflow-run.yml
+    with:
+      bazel-target-prefix: '//rb'
+
   build:
+    if: ${{ needs.check_workflow.outputs.result == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || contains(toJson(github.event.commits), '[run ruby]') == true }}
+    needs: check_workflow
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        target: ['selenium-devtools', 'selenium-webdriver']
+        target: [ 'selenium-devtools', 'selenium-webdriver' ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
@@ -35,11 +51,13 @@ jobs:
           command: build //rb:${{ matrix.target }}
 
   chrome-test:
+    if: ${{ needs.check_workflow.outputs.result == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || contains(toJson(github.event.commits), '[run ruby]') == true }}
+    needs: check_workflow
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        target: ['chrome-test', 'remote-chrome-test']
+        target: [ 'chrome-test', 'remote-chrome-test' ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
@@ -66,11 +84,13 @@ jobs:
           DISPLAY: :99
 
   firefox-test:
+    if: ${{ needs.check_workflow.outputs.result == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || contains(toJson(github.event.commits), '[run ruby]') == true }}
+    needs: check_workflow
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        target: ['firefox-test', 'remote-firefox-test']
+        target: [ 'firefox-test', 'remote-firefox-test' ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
@@ -100,6 +120,8 @@ jobs:
           DISPLAY: :99
 
   docs:
+    if: ${{ needs.check_workflow.outputs.result == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || contains(toJson(github.event.commits), '[run ruby]') == true }}
+    needs: check_workflow
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -120,6 +142,8 @@ jobs:
           command: run //rb:docs
 
   lint:
+    if: ${{ needs.check_workflow.outputs.result == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || contains(toJson(github.event.commits), '[run ruby]') == true }}
+    needs: check_workflow
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -140,11 +164,13 @@ jobs:
           command: run //rb:lint
 
   unit-test:
+    if: ${{ needs.check_workflow.outputs.result == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || contains(toJson(github.event.commits), '[run ruby]') == true }}
+    needs: check_workflow
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.6', 'jruby-9.3.0.0']
+        ruby: [ '2.6', 'jruby-9.3.0.0' ]
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
diff --git a/.github/workflows/dispatch-workflows.yml b/.github/workflows/dispatch-workflows.yml
@@ -10,16 +10,6 @@ on:
       - trunk
 
 jobs:
-  check_ruby:
-    uses: ./.github/workflows/should-workflow-run.yml
-    with:
-      bazel-target-prefix: '//rb'
-
-  run_ruby:
-    uses: ./.github/workflows/ruby.yml
-    needs: check_ruby
-    if: ${{ needs.check_ruby.outputs.result == 'true' }}
-
   check_javascript:
     uses: ./.github/workflows/should-workflow-run.yml
     with:
