[ci] Wrap all the build steps for the rbe build into one step

shs96c · shs96c · commit 2ddce9794ca4 · 2023-06-19T11:39:53.000+01:00
diff --git a/.github/workflows/ci-rbe.yml b/.github/workflows/ci-rbe.yml
@@ -5,30 +5,10 @@ on:
   workflow_dispatch:
 
 jobs:
-  set-ruby-version:
-    name: Set Ruby version
-    uses: ./.github/workflows/bazel.yml
-    with:
-      run: echo 'RUBY_VERSION = "jruby-9.4.2.0"' >rb/ruby_version.bzl
-
-  # The NPM repository rule wants to write to the HOME directory
-  # but that's configured for the remote build machines, so run
-  # that repository rule first so that the subsequent remote
-  # build runs successfully.
-  warm-cache:
-    name: Warm repository rule cache
-    uses: ./.github/workflows/bazel.yml
-    needs: set-ruby-version
-    with:
-      name: Cache
-      cache-key: rbe
-      run: bazel query @npm//:all
-
-  rbe-tests:
+  test:
     name: Test
     uses: ./.github/workflows/bazel.yml
-    needs: warm-cache
     with:
       name: Cache
       cache-key: rbe
-      run: bazel test --config=remote --keep_going //java/...
+      run: ./scripts/github-actions/ci-build.sh
diff --git a/scripts/github-actions/ci-build.sh b/scripts/github-actions/ci-build.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -eufo pipefail
+# We want to see what's going on
+set -x
+
+# We want to use a pre-built Ruby version
+echo 'RUBY_VERSION = "jruby-9.4.2.0"' >rb/ruby_version.bzl
+
+# The NPM repository rule wants to write to the HOME directory
+# but that's configured for the remote build machines, so run
+# that repository rule first so that the subsequent remote
+# build runs successfully.
+bazel query @npm//:all
+
+# Now run the tests. The engflow build uses pinned browsers
+# so this should be fine
+bazel test --config=remote --keep_going //java/...
