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

ci: use squash merge for bors #3896

Merged
merged 1 commit into from
Mar 7, 2022
Merged

ci: use squash merge for bors #3896

merged 1 commit into from
Mar 7, 2022

Conversation

delta1
Copy link
Contributor

@delta1 delta1 commented Mar 4, 2022

Description

updates bors config to use squash merge

@sdbondi
Copy link
Member

sdbondi commented Mar 7, 2022

bors +r

@bors
Copy link
Contributor

bors bot commented Mar 7, 2022

Did you mean "r+"?

@sdbondi
Copy link
Member

sdbondi commented Mar 7, 2022

bors r+

bors bot pushed a commit that referenced this pull request Mar 7, 2022
Description
---

updates bors config to use squash merge
@bors
Copy link
Contributor

bors bot commented Mar 7, 2022

This PR was included in a batch that successfully built, but then failed to merge into development. It will not be retried.

Additional information:

{"message":"Required status check \"check-title\" is expected. At least 1 approving review is required by reviewers with write access.","documentation_url":"https://docs.github.com/articles/about-protected-branches"}

@stringhandler stringhandler merged commit 023a250 into development Mar 7, 2022
@stringhandler stringhandler deleted the bors-squash branch March 7, 2022 07:13
sdbondi added a commit to Cifko/tari that referenced this pull request Mar 14, 2022
* development: (54 commits)
  fix(block-sync): use avg latency to determine slow sync peer for block sync (tari-project#3912)
  fix: fix merge mining proxy pool mining (tari-project#3814)
  revert: remove use of blocking tasks for DHT db (reverts tari-project#3887) (tari-project#3901)
  chore: add license info missing from some crates (tari-project#3892)
  fix(core): correctly filter pruned sync peers for block sync (tari-project#3902)
  ci: revert bors squash merge (tari-project#3900)
  fix: update metadata size calculation to use FixedSet.iter()
  docs(rfc): deep links structure convention - deep links is use (tari-project#3897)
  ci: use squash merge for bors (tari-project#3896)
  change struct
  fmt
  chore: fix npm dependencies
  feat: update FFI client user agent string
  fix: update wallet logging config
  fix completed tx index
  ignore clippy
  code review
  fmt
  fix: add bound for number of console_wallet notifications
  remove TODOs
  ...
sdbondi added a commit to sdbondi/tari that referenced this pull request Mar 15, 2022
* development: (118 commits)
  chore: clean up providing seed words from LibWallet (tari-project#3906)
  chore: move tari_script into its own crate (tari-project#3909)
  fix(consensus): check blockchain version within valid range (tari-project#3916)
  ci: fix missing npm deps and add javascript ci (tari-project#3910)
  refactor: use clap as a commands parser (tari-project#3867)
  chore: use git tagged tari_utilities and tari-crypto deps (tari-project#3913)
  fix: aligned tables left (tari-project#3899)
  ci: fix vue build
  v0.29.0
  feat!: add recovery byte to output features (tari-project#3727)
  add ffi ci check (tari-project#3915)
  fix(block-sync): use avg latency to determine slow sync peer for block sync (tari-project#3912)
  fix: fix merge mining proxy pool mining (tari-project#3814)
  revert: remove use of blocking tasks for DHT db (reverts tari-project#3887) (tari-project#3901)
  chore: add license info missing from some crates (tari-project#3892)
  fix(core): correctly filter pruned sync peers for block sync (tari-project#3902)
  ci: revert bors squash merge (tari-project#3900)
  fix: update metadata size calculation to use FixedSet.iter()
  docs(rfc): deep links structure convention - deep links is use (tari-project#3897)
  ci: use squash merge for bors (tari-project#3896)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants