From 2b643f273481eec4d244708d71561a648872a81e Mon Sep 17 00:00:00 2001 From: odunbar Date: Tue, 7 Nov 2023 21:05:10 -0800 Subject: [PATCH] change workflows rm bors toml and readme rm bors from docs --- .github/workflows/Docs.yml | 11 ++--------- .github/workflows/Tests.yml | 6 ++---- README.md | 4 ---- bors.toml | 10 ---------- docs/src/contributing.md | 6 +----- 5 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 bors.toml diff --git a/.github/workflows/Docs.yml b/.github/workflows/Docs.yml index 2ce37205c..6239a0de8 100644 --- a/.github/workflows/Docs.yml +++ b/.github/workflows/Docs.yml @@ -3,16 +3,9 @@ name: Documentation on: push: branches: - - master - - trying - - staging + - main tags: '*' pull_request: - paths: - - 'docs/**' - - 'src/**' - - 'Project.toml' - - 'Manifest.toml' jobs: docs-build: @@ -26,7 +19,7 @@ jobs: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@v1 with: - version: 1.7.3 + version: "1" - name: Cache artifacts uses: actions/cache@v1 env: diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml index 83afa14ac..76a18e597 100644 --- a/.github/workflows/Tests.yml +++ b/.github/workflows/Tests.yml @@ -3,10 +3,8 @@ name: Tests on: pull_request: push: - branches: - - staging - - trying - - master + tags: '*' + jobs: test-linux: timeout-minutes: 60 diff --git a/README.md b/README.md index 7a0e45a82..defd7b10e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ Implements a derivative-free machine-learning accelerated pipeline for uncertain | **Docs Build** | [![docs build][docs-bld-img]][docs-bld-url] | | **Unit tests** | [![unit tests][unit-tests-img]][unit-tests-url] | | **Code Coverage** | [![codecov][codecov-img]][codecov-url] | -| **Bors** | [![Bors enabled][bors-img]][bors-url] | [zenodo-img]: https://zenodo.org/badge/179573047.svg [zenodo-latest-url]: https://zenodo.org/badge/latestdoi/179573047 @@ -26,7 +25,4 @@ Implements a derivative-free machine-learning accelerated pipeline for uncertain [codecov-img]: https://codecov.io/gh/CliMA/CalibrateEmulateSample.jl/branch/master/graph/badge.svg [codecov-url]: https://codecov.io/gh/CliMA/CalibrateEmulateSample.jl -[bors-img]: https://bors.tech/images/badge_small.svg -[bors-url]: https://app.bors.tech/repositories/24774 - diff --git a/bors.toml b/bors.toml deleted file mode 100644 index ab3fde3a0..000000000 --- a/bors.toml +++ /dev/null @@ -1,10 +0,0 @@ -status = [ - 'docs-build', - 'test-linux', - 'test-macos', - 'test-windows', - 'buildkite/calibrateemulatesample-ci' -] -delete_merged_branches = true -timeout_sec = 4800 -block_labels = [ "do-not-merge-yet" ] diff --git a/docs/src/contributing.md b/docs/src/contributing.md index 7c1c4e8b5..25591b3c2 100644 --- a/docs/src/contributing.md +++ b/docs/src/contributing.md @@ -156,8 +156,4 @@ do not require the unit tests to be run. ### The merge process -We use [`bors`](https://bors.tech/) to manage merging PR's in the the `CalibrateEmulateSample` repo. -If you're a collaborator and have the necessary permissions, you can type -`bors try` in a comment on a PR to have integration test suite run on that -PR, or `bors r+` to try and merge the code. Bors ensures that all integration tests -for a given PR always pass before merging into `main`. The integration tests currently run example cases in `examples/`. Any breaking changes will need to also update the `examples/`, else bors will fail. +We ensure that all unit tests across several environments, Documentation builds, and integration tests (managed by Buildkite), pass before merging any PR into `main`. The integration tests currently run some of our example cases in `examples/`.