move to github merge queue

CliMA · Nov 7, 2023 · fc33772 · fc33772
1 parent f03f850
commit fc33772
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 18 deletions.
diff --git a/.github/workflows/CodeCov.yml b/.github/workflows/CodeCov.yml
@@ -2,12 +2,9 @@ name: CodeCov
 
 on:
   push:
-    branches:
-      - main
-      - trying
-      - staging
     tags: '*'
   pull_request:
+  merge_group:
 
 jobs:
   codecov:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,12 +1,9 @@
 name: ci
 on:
   push:
-    branches:
-      - main
-      - trying
-      - staging
     tags: '*'
   pull_request:
+  merge_group:
 
 jobs:
   test:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -2,12 +2,9 @@ name: Documentation
 
 on:
   push:
-    branches:
-      - main
-      - trying
-      - staging
     tags: '*'
   pull_request:
+  merge_group:
 
 jobs:
   docbuild:

diff --git a/.github/workflows/julia_formatter.yml b/.github/workflows/julia_formatter.yml
@@ -2,12 +2,9 @@ name: JuliaFormatter
 
 on:
   push:
-    branches:
-      - main
-      - trying
-      - staging
     tags: '*'
   pull_request:
+  merge_group:
 
 jobs:
   format:

diff --git a/regression_tests/README.md b/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 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.
+ 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.
 
 ## How we track which dataset to compare against
 

diff --git a/regression_tests/move_output.jl b/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 branch == "staging"
+    if startswith(branch, "gh-readonly-queue/main/")
         commit_sha = commit[1:7]
         mkpath(cluster_data_prefix)
         path = joinpath(cluster_data_prefix, commit_sha)