diff options
| author |  Henrik Tjäder <henrik@tjaders.com>
| 2023-06-30 01:24:11 +0200 |
|---|---|---|
| committer |  Emil Fresk <emil.fresk@gmail.com>
| 2023-06-30 04:37:59 +0000 |
| commit | 28614a088e0bdf37f98ff990a5641edfba6c8eca (patch) | |
| tree | e4a2d31cc35aa0a38b6d9c9f1f06b2e4a442affd | |
| parent | 6480ec5c3a4c89d1f79075b76d3ab9230527cd54 (diff) | |
| download | rtic-28614a088e0bdf37f98ff990a5641edfba6c8eca.tar.gz rtic-28614a088e0bdf37f98ff990a5641edfba6c8eca.tar.zst rtic-28614a088e0bdf37f98ff990a5641edfba6c8eca.zip | |
CI: Remove Bors
| -rw-r--r-- | .github/bors.toml | 3 | ||||
| -rw-r--r-- | .github/workflows/build.yml | 10 |
2 files changed, 1 insertions, 12 deletions
diff --git a/.github/bors.toml b/.github/bors.toml deleted file mode 100644 index aee6042f..00000000 --- a/.github/bors.toml +++ /dev/null @@ -1,3 +0,0 @@ -block_labels = ["S-blocked"] -delete_merged_branches = true -status = ["ci"] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a87db6c3..dbdbc0e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,13 +1,10 @@ name: Build on: + merge_group: pull_request: push: branches: - master - - staging - - trying - - bors/staging - - bors/trying env: CARGO_TERM_COLOR: always @@ -493,8 +490,6 @@ jobs: run: echo "Master branch contains a development release, no git push performed" # Only runs when pushing to master branch - # Bors run CI against staging branch, - # if that succeeds Borst tries against master branch # If all tests pass, then deploy stage is run deploy: name: deploy @@ -638,10 +633,7 @@ jobs: publish_dir: ./bookstodeploy force_orphan: true - # Refs: https://github.com/rust-lang/crater/blob/9ab6f9697c901c4a44025cf0a39b73ad5b37d198/.github/workflows/bors.yml#L125-L149 - # # ALL THE PREVIOUS JOBS NEEDS TO BE ADDED TO THE `needs` SECTION OF THIS JOB! - ci-success: name: ci if: github.event_name == 'push' && success() |