Skip to content

Commit

Permalink
Merge pull request #1037 from georust/frewsxcv-patch-1
Browse files Browse the repository at this point in the history
Delete bors.toml in favor of GitHub merge queues
  • Loading branch information
michaelkirk authored Aug 21, 2023
2 parents dea43d2 + b065119 commit 267ae70
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 10 deletions.
24 changes: 17 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@ on:
- trying
- release/**
pull_request:
merge_group:
schedule: [cron: "45 6 * * *"]

name: Run tests
jobs:
# The `ci-result` job doesn't actually test anything - it just aggregates the
# overall build status for bors, otherwise our bors.toml would need an entry
# overall build status, otherwise the merge queue would need an entry
# for each individual job produced by the job-matrix.
#
# Ref: https://github.com/rust-lang/crater/blob/9ab6f9697c901c4a44025cf0a39b73ad5b37d198/.github/workflows/bors.yml#L125-L149
#
# ALL THE SUBSEQUENT JOBS NEED THEIR `name` ADDED TO THE `needs` SECTION OF THIS JOB!
ci-result:
# ALL THE SUBSEQUENT JOBS NEED THEIR `name` ADDED TO THE `needs` SECTION OF both "ci result" JOBS!
ci-success:
name: ci result
runs-on: ubuntu-latest
needs:
Expand All @@ -27,12 +26,23 @@ jobs:
- geo_postgis
- geo_fuzz
- bench
if: success()
steps:
- name: Mark the job as a success
if: success()
run: exit 0
ci-failure:
name: ci result
runs-on: ubuntu-latest
needs:
- lint
- geo_types
- geo
- geo_postgis
- geo_fuzz
- bench
if: failure()
steps:
- name: Mark the job as a failure
if: "!success()"
run: exit 1

lint:
Expand Down
3 changes: 0 additions & 3 deletions bors.toml

This file was deleted.

0 comments on commit 267ae70

Please sign in to comment.