Revert "Move from bors to GitHub Merge Queue"

This reverts commit 25a8f96.

.github/workflows/CodeCov.yml

@@ -4,9 +4,10 @@ on:
   push:
     branches:
       - main
+      - trying
+      - staging
     tags: '*'
   pull_request:
-  merge_group:
 
 jobs:
   codecov:

.github/workflows/ci.yml

@@ -3,9 +3,10 @@ on:
   push:
     branches:
       - main
+      - trying
+      - staging
     tags: '*'
   pull_request:
-  merge_group:
 
 jobs:
   test:

.github/workflows/docs.yml

@@ -4,9 +4,10 @@ on:
   push:
     branches:
       - main
+      - trying
+      - staging
     tags: '*'
   pull_request:
-  merge_group:
 
 jobs:
   docbuild:

.github/workflows/julia_formatter.yml

@@ -4,9 +4,10 @@ on:
   push:
     branches:
       - main
+      - trying
+      - staging
     tags: '*'
   pull_request:
-  merge_group:
 
 jobs:
   format:

bors.toml

@@ -0,0 +1,12 @@
+status = [
+  # "ci 1.8.5 - ubuntu-latest",
+  # "ci 1.8.5 - windows-latest",
+  # "ci 1.8.5 - macos-latest",
+  "buildkite/climaatmos-ci",
+  "docbuild",
+  "format",
+]
+delete_merged_branches = true
+timeout_sec = 72000
+block_labels = [ "do-not-merge-yet" ]
+cut_body_after = "<!--"

regression_tests/README.md

@@ -79,7 +79,7 @@ Regression tests are performed at the end of `examples/hybrid/driver.jl`, after
 After these steps are performed at the end of the driver, additional jobs are run:
 
  1) Print `computed_mse` for all jobs to make updating `regression_tests/mse_tables.jl` easy
- 2) If we're on the github queue merging branch (all tests have passed, and the PR is effectively merging), move the `NCDataset`s from the scratch directory onto the dedicated folder on the Caltech Central cluster.
+ 2) If we're on the staging branch (all tests have passed, and the PR is effectively merging), move the `NCDataset`s from the scratch directory onto the dedicated folder on the Caltech Central cluster.
 
 ## How we track which dataset to compare against
 

regression_tests/move_output.jl

@@ -21,7 +21,7 @@ if haskey(ENV, "BUILDKITE_COMMIT") && haskey(ENV, "BUILDKITE_BRANCH")
 
     using Glob
     @show readdir(joinpath(@__DIR__, ".."))
-    if startswith(branch, "gh-readonly-queue/main/")
+    if branch == "staging"
         commit_sha = commit[1:7]
         mkpath(cluster_data_prefix)
         path = joinpath(cluster_data_prefix, commit_sha)