Skip to content

Commit

Permalink
workflows: make a few EngFlow builds mandatory (non-EXPERIMENTAL)
Browse files Browse the repository at this point in the history
Epic: CRDB-8308
Release note: None
  • Loading branch information
rickystewart committed Mar 12, 2024
1 parent 01dc057 commit 85e21f9
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 40 deletions.
7 changes: 6 additions & 1 deletion .github/bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 23 additions & 3 deletions .github/workflows/github-actions-essential-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions build/teamcity/cockroach/ci/builds/build_macos_arm64.sh

This file was deleted.

12 changes: 0 additions & 12 deletions build/teamcity/cockroach/ci/builds/build_macos_x86_64.sh

This file was deleted.

12 changes: 0 additions & 12 deletions build/teamcity/cockroach/ci/builds/build_windows_x86_64.sh

This file was deleted.

0 comments on commit 85e21f9

Please sign in to comment.