You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
|`breaking-change`| PR requires synchronized changes with bittensor | Triggers an automatic bot message so the relevant teams are made aware of the change well in advance |
88
-
|`migration`| PR contains one or more migrations | none |
89
-
|`devnet-companion`| Designates a devnet companion PR | Presence of `devnet-companion` label is checked |
90
-
|`devnet-ready`| PR's branch has been merged into the `devnet-ready` branch and will be included in the next `devnet` deploy | none |
91
-
|`on-devnet`| PR has been deployed to `devnet`| Removes `devnet-ready`|
92
-
|`devnet-pass`| PR has passed manual testing on `devnet`|`devnet-pass` or `devnet-skip` required |
93
-
|`devnet-skip`| Allows a critical hotfix PR to skip required testing on `devnet`|`devnet-pass` or `devnet-skip` required |
94
-
|`devnet-fail`| PR has failed manual testing on `devnet` and requires modification | none |
95
-
|`testnet-companion`| Designates a testnet companion PR | Presence of `testnet-companion` label is checked |
96
-
|`on-testnet`| PR has been deployed to `testnet`| none |
97
-
|`testnet-pass`| PR has passed manual testing on `testnet`|`testnet-pass` or `testnet-skip` required |
98
-
|`testnet-skip`| Allows a critical hotfix PR to skip required manual testing and SOP on `testnet`|`testnet-pass` or `testnet-skip` required |
99
-
|`testnet-fail`| PR has failed manual testing on `testnet` and requires modification | none |
100
-
101
48
102
49
## Branches
103
50
104
51
105
52
### `devnet-ready`
106
53
107
-
Companion PRs merge into this branch, eventually accumulating into a merge of `devnet-ready`
108
-
into `devnet`, coinciding with a deploy of `devnet`.
54
+
All new feature/change/fix PRs should merge into this branch.
109
55
110
56
#### Restrictions
111
57
* no deleting the branch
112
58
* no force pushes
113
59
* no direct pushes
114
-
* require 1 positive review from an administrator
115
-
* new code changes invalidate existing reviews
60
+
* require 3 positive review from an administrator
61
+
* new code changes do _not_invalidate existing reviews
116
62
* only merge commit style merging allowed
117
63
118
64
#### CI-Enforced Restrictions
119
65
*`check-rust.yml` must pass
120
-
* TODO: parent PR must be linked to in description
121
-
* TODO: parent PR must have the required number of positive reviews
122
66
123
67
124
68
### `devnet`
@@ -164,33 +108,8 @@ tags for `testnet` releases.
164
108
165
109
### `main`
166
110
167
-
Default branch for all new PRs. Slightly ahead of what is currently on `finney`. When a PR is all
168
-
green and "done", meaning it has been tested on `devnet` and `testnet`, it can be merged into
169
-
`main`. Contains tags for `finney` releases.
170
-
171
-
#### Restrictions
172
-
* no deleting the branch
173
-
* no force pushes
174
-
* no direct pushes
175
-
* require 3 positive reviews from core team members
176
-
* new code changes invalidate existing reviews
177
-
* all conversations must be resolved
178
-
* only merge commit style merging allowed
179
-
180
-
#### CI-Enforced Restrictions
181
-
*`check-rust.yml` must pass
182
-
*`check-labels.yml` must pass
183
-
* must have `devnet-skip` or `devnet-pass` label
184
-
* must have `testnet-skip` or `testnet-pass` label
185
-
* if `breaking-change` label is present, bot will message the appropriate teams
186
-
* TODO: when we get auditing, presence of `needs-audit` label = require a review from auditor
187
-
* TODO: track SOP on PR based on label age
188
-
189
-
190
-
### `finney`
191
-
192
111
Tracks the current state of what is deployed to `finney` (mainnet). Updated via an
193
-
administrator-submitted PR merging `main` into `finney` in concert with a `finney` deploy.
112
+
administrator-submitted PR merging `testnet` into `main` in concert with a `finney` deploy.
194
113
195
114
#### Restrictions
196
115
* no deleting the branch
@@ -203,5 +122,5 @@ administrator-submitted PR merging `main` into `finney` in concert with a `finne
203
122
#### CI-Enforced Restrictions
204
123
*`check-rust.yml` must pass
205
124
*`check-finney.yml` must pass
206
-
* spec_version must be greater than what is currently on live `finney`
125
+
*`spec_version` must be greater than what is currently on live `finney`
0 commit comments