diem / dip

Libra Improvement Proposals
https://lip.libra.org
Apache License 2.0
40 stars 55 forks source link

[lip-6] Edits #46

Closed DavidLDill closed 4 years ago

DavidLDill commented 4 years ago

I've mostly tried to do some wordsmithing.

There are some "TODO"s embedded in paragraphs [TODO... ] for points that I didn't know how to resolve.

The properties are still drafty until I make more progress in formal specification and verification.

DavidLDill commented 4 years ago

/land

bors-libra commented 4 years ago

:exclamation: Land has been canceled due to this PR being updated with new commits. Please issue another Land command if you want to requeue this PR.

DavidLDill commented 4 years ago

/land

DavidLDill commented 4 years ago

/land

bors-libra commented 4 years ago

@DavidLDill :bulb: This PR is already queued for landing

bors-libra commented 4 years ago

:boom: Tests timed-out

DavidLDill commented 4 years ago

/help

bors-libra commented 4 years ago
Bors help and documentation
Bors is a Github App used to manage merging of PRs in order to ensure that CI is always green. It does so by maintaining a [Merge Queue](https://github.com/libra/lip/projects/1). Once a PR reaches the head of the Merge Queue it is rebased on top of the latest version of the PR's `base-branch` (generally `master`) and then triggers CI. If CI comes back green the PR is then merged into the `base-branch`. Regardless of the outcome, the next PR is the queue is then processed. ### General - This project's Merge Queue can be found [here](https://github.com/libra/lip/projects/1). - This project requires PRs to be [Reviewed](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews) and Approved before they can be queued for merging. - Before PR's can be merged they must be configured with ["Allow edits from maintainers"](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork) enabled. This is needed for Bors to be able to update PR's in-place so that Github can properly recognize and mark them as "merged" once they've been merged into the upstream branch. ### Commands Bors actions can be triggered by posting a comment which includes a line of the form `/`. | Command | Action | Description | | --- | --- | --- | | __Land__ | `land`, `merge` | attempt to land or merge a PR | | __Canary__ | `canary`, `try` | canary a PR by performing all checks without merging | | __Cancel__ | `cancel`, `stop` | stop an in-progress land | | __Cherry Pick__ | `cherry-pick ` | cherry-pick a PR into `` branch | | __Priority__ | `priority` | set the priority level for a PR (`high`, `normal`, `low`) | | __Help__ | `help`, `h` | show this help message | ### Options Options for Pull Requests are configured through the application of labels. |           Option           | Description | | --- | --- | | ![label: bors-high-priority](https://img.shields.io/static/v1?label=&message=bors-high-priority&color=lightgrey) | Indicates that the PR is high-priority. When queued the PR will be placed at the head of the merge queue. | | ![label: bors-low-priority](https://img.shields.io/static/v1?label=&message=bors-low-priority&color=lightgrey) | Indicates that the PR is low-priority. When queued the PR will be placed at the back of the merge queue. | | ![label: bors-squash](https://img.shields.io/static/v1?label=&message=bors-squash&color=lightgrey) | Before merging the PR will be squashed down to a single commit, only retaining the commit message of the first commit in the PR. |
JoelMarcey commented 4 years ago

@DavidLDill bors-libra is kinda broken for this repo due to how we are doing branch protections and requirements, I believe. So we can just directly merge it for now, if you want.

cc @bmwill

bmwill commented 4 years ago

If we remove the requirement on deploy-preivew check and I do a reconfig it should work properly. Just let me know if you want me to do that

JoelMarcey commented 4 years ago

@bmwill I want to come up with a way to remove the check for bors but have the check so that no one accidentally lands a broken site. I want my cake and I want to eat it too.

DavidLDill commented 4 years ago

I don't know what to do to make this land, and Lera would like to work on it. So, any help you can give to get it landed would be great.

JoelMarcey commented 4 years ago

@DavidLDill merged!