Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update workflows to rm bors #252

Merged
merged 1 commit into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions .github/workflows/Docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/Tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ name: Tests
on:
pull_request:
push:
branches:
- staging
- trying
- master
tags: '*'

jobs:
test-linux:
timeout-minutes: 60
Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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


10 changes: 0 additions & 10 deletions bors.toml

This file was deleted.

6 changes: 1 addition & 5 deletions docs/src/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/`.
Loading