diff --git a/.github/workflows/CodeCov.yml b/.github/workflows/CodeCov.yml index c8e70786..48402687 100644 --- a/.github/workflows/CodeCov.yml +++ b/.github/workflows/CodeCov.yml @@ -4,10 +4,9 @@ on: push: branches: - main - - trying - - staging tags: '*' pull_request: + merge_group: jobs: codecov: diff --git a/.github/workflows/JuliaFormatter.yml b/.github/workflows/JuliaFormatter.yml index c8ade07b..cf07cc4d 100644 --- a/.github/workflows/JuliaFormatter.yml +++ b/.github/workflows/JuliaFormatter.yml @@ -4,10 +4,9 @@ on: push: branches: - main - - trying - - staging tags: '*' pull_request: + merge_group: jobs: format: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c17ca9e9..0afb0b10 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,10 +3,9 @@ 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 index a3c95164..4c37fb77 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -4,10 +4,9 @@ on: push: branches: - main - - trying - - staging tags: '*' pull_request: + merge_group: jobs: docbuild: diff --git a/bors.toml b/bors.toml deleted file mode 100644 index cefcd110..00000000 --- a/bors.toml +++ /dev/null @@ -1,18 +0,0 @@ -status = [ - "buildkite/thermodynamics-ci", - "ci 1.6 - ubuntu-latest", - "ci 1.6 - windows-latest", - "ci 1.6 - macOS-latest", - "ci 1.7 - ubuntu-latest", - "ci 1.7 - windows-latest", - "ci 1.7 - macOS-latest", - "ci 1.8 - ubuntu-latest", - "ci 1.8 - windows-latest", - "ci 1.8 - macOS-latest", - "docbuild", - "format", -] -delete_merged_branches = true -timeout_sec = 10800 -block_labels = [ "do-not-merge-yet" ] -cut_body_after = "