diff options
| author | Orhun Parmaksız <orhunparmaksiz@gmail.com> | 2023-05-10 22:32:55 +0300 |
|---|---|---|
| committer | Orhun Parmaksız <orhunparmaksiz@gmail.com> | 2023-05-10 22:32:55 +0300 |
| commit | 2133a2c1c4f51c887b836ee4cf4f206de2eaa8da (patch) | |
| tree | d036dcf03ca7c529e557d3d135cd6d9167840d5b | |
| parent | 9a7664801fee4b430741d041c238622d64dc6e0f (diff) | |
| parent | dbbf6cd345f9da4f9d4ae8e2277da900ea3f7a0f (diff) | |
Merge branch 'master' into dependabot/cargo/clap_complete-4.2.2
| -rw-r--r-- | .github/bors.toml | 10 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 3 |
2 files changed, 1 insertions, 12 deletions
diff --git a/.github/bors.toml b/.github/bors.toml deleted file mode 100644 index 362e468..0000000 --- a/.github/bors.toml +++ /dev/null @@ -1,10 +0,0 @@ -status = [ - "Build for x86_64-unknown-linux-gnu using Rust stable (on ubuntu-22.04)", - "Build for x86_64-unknown-linux-musl using Rust stable (on ubuntu-22.04)", - "Build for x86_64-unknown-linux-gnu using Rust nightly (on ubuntu-22.04)", - "Build for x86_64-unknown-linux-musl using Rust nightly (on ubuntu-22.04)", -] -delete_merged_branches = true -update_base_for_deletes = true -cut_body_after = "<details>" -commit_title = "chore: Merge ${PR_REFS}" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eacfbbd..dabe6c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,11 +4,10 @@ on: push: branches: - master - - staging # for bors - - trying # for bors pull_request: branches: - master + merge_group: schedule: - cron: "0 0 * * 0" |