From 85e21f95ff91d51fc85ee4d6a02f7a0abccd7ab7 Mon Sep 17 00:00:00 2001
From: Ricky Stewart <ricky@cockroachlabs.com>
Date: Mon, 11 Mar 2024 18:23:01 -0500
Subject: [PATCH] workflows: make a few EngFlow builds mandatory
 (non-EXPERIMENTAL)

Epic: CRDB-8308
Release note: None
---
 .github/bors.toml                             |  7 ++++-
 .../workflows/github-actions-essential-ci.yml | 26 ++++++++++++++++---
 .../cockroach/ci/builds/build_macos_arm64.sh  | 12 ---------
 .../cockroach/ci/builds/build_macos_x86_64.sh | 12 ---------
 .../ci/builds/build_windows_x86_64.sh         | 12 ---------
 5 files changed, 29 insertions(+), 40 deletions(-)
 delete mode 100755 build/teamcity/cockroach/ci/builds/build_macos_arm64.sh
 delete mode 100755 build/teamcity/cockroach/ci/builds/build_macos_x86_64.sh
 delete mode 100755 build/teamcity/cockroach/ci/builds/build_windows_x86_64.sh

diff --git a/.github/bors.toml b/.github/bors.toml
index 3c30cc63468a..a1dcae5f8bd0 100644
--- a/.github/bors.toml
+++ b/.github/bors.toml
@@ -2,7 +2,12 @@
 
 # List of commit statuses that must pass on the merge commit before it is
 # pushed to master.
-status = ["Bazel Essential CI (Cockroach)"]
+status = [
+       "Bazel Essential CI (Cockroach)",
+       "macos_amd64_build",
+       "macos_arm64_build",
+       "windows_build",
+]
 
 # List of commit statuses that must not be failing on the PR commit when it is
 # r+-ed. If it's still in progress (for e.g. if CI is still running), bors will
diff --git a/.github/workflows/github-actions-essential-ci.yml b/.github/workflows/github-actions-essential-ci.yml
index b62bf1ac9553..768f5d8de137 100644
--- a/.github/workflows/github-actions-essential-ci.yml
+++ b/.github/workflows/github-actions-essential-ci.yml
@@ -3,6 +3,26 @@ on:
   pull_request:
     types: [ opened, reopened, synchronize, edited ]
     branches: [ master ]
+  push:
+    branches:
+      - 'master'
+      - 'release-*'
+      - 'staging'
+      - 'trying'
+      - '!release-1.0*'
+      - '!release-1.1*'
+      - '!release-2.0*'
+      - '!release-2.1*'
+      - '!release-19.1*'
+      - '!release-19.2*'
+      - '!release-20.1*'
+      - '!release-20.2*'
+      - '!release-21.1*'
+      - '!release-21.2*'
+      - '!release-22.1*'
+      - '!release-22.2*'
+      - '!release-23.1*'
+      - '!release-23.2*'
 concurrency:
   group: ${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
@@ -141,7 +161,7 @@ jobs:
       - name: clean up
         run: ./build/github/cleanup-engflow-keys.sh
         if: always()
-  EXPERIMENTAL_macos_amd64_build:
+  macos_amd64_build:
     runs-on: [self-hosted, basic_runner_group]
     steps:
       - uses: actions/checkout@v4
@@ -159,7 +179,7 @@ jobs:
       - name: clean up
         run: ./build/github/cleanup-engflow-keys.sh
         if: always()
-  EXPERIMENTAL_macos_arm64_build:
+  macos_arm64_build:
     runs-on: [self-hosted, basic_runner_group]
     steps:
       - uses: actions/checkout@v4
@@ -197,7 +217,7 @@ jobs:
       - name: clean up
         run: ./build/github/cleanup-engflow-keys.sh
         if: always()
-  EXPERIMENTAL_windows_build:
+  windows_build:
     runs-on: [self-hosted, basic_runner_group]
     steps:
       - uses: actions/checkout@v4
diff --git a/build/teamcity/cockroach/ci/builds/build_macos_arm64.sh b/build/teamcity/cockroach/ci/builds/build_macos_arm64.sh
deleted file mode 100755
index 3eee56e074b6..000000000000
--- a/build/teamcity/cockroach/ci/builds/build_macos_arm64.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-dir="$(dirname $(dirname $(dirname $(dirname $(dirname "${0}")))))"
-
-source "$dir/teamcity-support.sh"  # For $root
-source "$dir/teamcity-bazel-support.sh"  # For run_bazel
-
-tc_start_block "Run Bazel build"
-run_bazel build/teamcity/cockroach/ci/builds/build_impl.sh crossmacosarm
-tc_end_block "Run Bazel build"
diff --git a/build/teamcity/cockroach/ci/builds/build_macos_x86_64.sh b/build/teamcity/cockroach/ci/builds/build_macos_x86_64.sh
deleted file mode 100755
index 84a1cf91c02e..000000000000
--- a/build/teamcity/cockroach/ci/builds/build_macos_x86_64.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-dir="$(dirname $(dirname $(dirname $(dirname $(dirname "${0}")))))"
-
-source "$dir/teamcity-support.sh"  # For $root
-source "$dir/teamcity-bazel-support.sh"  # For run_bazel
-
-tc_start_block "Run Bazel build"
-run_bazel build/teamcity/cockroach/ci/builds/build_impl.sh crossmacos
-tc_end_block "Run Bazel build"
diff --git a/build/teamcity/cockroach/ci/builds/build_windows_x86_64.sh b/build/teamcity/cockroach/ci/builds/build_windows_x86_64.sh
deleted file mode 100755
index 3307d20c2d6d..000000000000
--- a/build/teamcity/cockroach/ci/builds/build_windows_x86_64.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-dir="$(dirname $(dirname $(dirname $(dirname $(dirname "${0}")))))"
-
-source "$dir/teamcity-support.sh"  # For $root
-source "$dir/teamcity-bazel-support.sh"  # For run_bazel
-
-tc_start_block "Run Bazel build"
-run_bazel build/teamcity/cockroach/ci/builds/build_impl.sh crosswindows
-tc_end_block "Run Bazel build"