Skip to content

Commit 1ad0a74

Browse files
authored
Merge pull request #924 from carver/flamingo
Batch of flamingo updates for the week
2 parents 20e6693 + 41fdc28 commit 1ad0a74

File tree

6 files changed

+18
-59
lines changed

6 files changed

+18
-59
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ jobs:
162162
test:
163163
description: |
164164
Run tests.
165-
resource_class: xlarge
165+
resource_class: 2xlarge
166166
executor:
167167
name: rust/default
168168
tag: 1.71.1

.github/workflows/stale.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
steps:
1212
- uses: actions/stale@v5
1313
with:
14+
close-issue-reason: "not_planned"
1415
days-before-issue-stale: 42
1516
days-before-issue-close: 14
1617
stale-issue-label: "stale"

book/src/developers/contributing/releases/deployment.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ This step directs Ansible to use the current master version of trin. Read [about
4646
- Check monitoring tools to understand network health, and compare against post-deployment, eg~
4747
- [Glados](http://glados.ethportal.net/content/)
4848
- [Grafana](https://trin-bench.ethdevops.io/d/e23mBdEVk/trin-metrics?orgId=1)
49+
- Activate the virtual environment in the cluster repo: `. venv/bin/activate`
4950
- Go into Portal section of Ansible: `cd portal-network/trin/ansible/`
5051
- Run the deployment: `ansible-playbook playbook.yml --tags trin`
5152
- Wait for completion

book/src/developers/contributing/releases/prerelease_checklist.md

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,6 @@ Before running a release, follow these steps.
44

55
## Communicate
66

7-
At least one day before the release, announce in chat that you'll be running it.
8-
9-
There may be an emergency scenario that requires a shorter time frame, but at
10-
least one other person on the team should agree with you.
11-
12-
## Update dependencies
13-
14-
- Use `cargo outdated` (and maybe `cargo outdated --aggressive`) to identify any old dependencies.
15-
- Post a PR updating any old dependencies
16-
- If *only* the Cargo.lock changes, then you can merge without a review, after CI turns green.
17-
18-
## Run portal-hive
19-
20-
New releases should not cause regressions in portal-hive. Run it locally
21-
against master and compare it against the [daily portal-hive
22-
results](https://portal-hive.ethdevops.io/).
23-
24-
If there is a regression, pause the release, and announce it in chat. Fixing
25-
the regression is the new priority.
26-
27-
## Generate release notes
28-
29-
**Prerequisite**: Release notes are generated with
30-
[towncrier](https://pypi.org/project/towncrier/). Ensure to have `towncrier`
31-
installed and the command is available.
32-
33-
Run `make notes version=<version>` where `<version>` is the version we are
34-
generating the release notes for e.g. `0.2.0-alpha.3`.
35-
36-
Example:
37-
38-
```sh
39-
make notes version=0.2.0-alpha.3
40-
```
41-
42-
Examine the generated release notes and if needed perform and commit any manual changes.
43-
Generated notes are located in `/docs/release_notes.md`.
44-
45-
Update the release notes using the normal PR process: post it, get a review & merge.
7+
Announce in #trin chat the upcoming release. Aim for a day or more notice, but
8+
announcing a few minutes before releasing is still better than not saying
9+
anything.

book/src/developers/contributing/releases/release_checklist.md

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ Make sure that version follows [semver](https://semver.org/) rules e.g (`0.2.0-a
88

99
## Bump the version
1010

11-
Update the version number in Cargo.toml file(s), using semantic versioning.
12-
Once that's merged to master, tag it like:
13-
14-
```sh
15-
git tag -a v0.1.0-alpha.6 -m "Version 0.1.0-alpha.6"
16-
git push upstream --tags
17-
```
11+
- In github, open the page to [create the new release](https://github.com/ethereum/trin/releases/new).
12+
- In the tag, type out the version number that the new release bumps to.
13+
- Github should say "Excellent! This tag will be created from the target when you publish this release."
14+
- Click "Generate release notes"
15+
- Add "Trin " to the beginning of the release title
16+
- Add any clarifying information that's helpful about the release
1817

1918
## Build the binary for release
2019

@@ -32,16 +31,6 @@ We no longer use `make release` because it's not worth the effort to release all
3231
> ⚠️ **TODO**: How do we generate binaries for all target systems, for this
3332
> release page? Linux, Mac, Windows, ARM, etc
3433
35-
## Create github release page
36-
37-
Go to [trin tags](https://github.com/ethereum/trin/tags).
38-
39-
Find the tag you pushed, and in the `...` menu, select [Create release]
40-
41-
Write up a high-level overview, and link to the generated release notes.
42-
43-
Attach the generated binaries.
44-
4534
## Deploy
4635

4736
Push these changes out to the nodes we run in the network. See next page for details.

book/src/developers/contributing/rotation/index.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ At the end of the previous week, you will get the [Flamingo notes](https://notes
2828

2929
Read through the notes, and then generate the new checklist for the week, by [creating a note from this template](https://notes.ethereum.org/?nav=overview&template=b35733cd-b374-4b79-bc57-f2bb58ee651e).
3030

31-
Link the generated checklist into the Flamingo notes for your week. Make sure your status is "online" in Discord. Make sure you're tagged under the `trin-flamingo` role. Put on your favorite pink shirt. Listen to the [flamingo anthem](https://www.youtube.com/watch?v=6hJv5yBLe9c). Fly.
31+
Link the generated checklist into the Flamingo notes for your week. Make sure your status is "online" in Discord. Make sure you're tagged under the `trin-flamingo` role. Put on your favorite pink shirt. Watch a [silly flamingo video](https://www.youtube.com/watch?v=gWNWtbPEWw0). Fly.
3232

3333
### Daily
3434

@@ -44,12 +44,16 @@ When you get to the end of your checklist, here are ideas for what to work on ne
4444
- Respond to [Github Participating Notifications](https://github.com/notifications?query=reason%3Aparticipating)
4545
- Review PRs that have been stuck for >24 hours
4646
- Find a [Flamingo Issue](https://github.com/ethereum/trin/issues?q=is%3Aopen+is%3Aissue+label%3Aflamingo) that seems promising, and assign it to yourself (and the project dashbord)
47+
- Run `cargo outdated`
48+
- Pick one or several libraries to upgrade
49+
- Post a PR with the new `Cargo.lock`
50+
- If `cargo outdated` shows all libraries as up-to-date, try `cargo outdated --aggressive`
4751
- grep code for `TODO`s. For each one you find:
4852
- write up issue to explain what needs to be done, and a plan
4953
- link to the TODO in the code, and any relevant context
5054
- label issue as Flamingo. If it is not urgent and a good fit, add "Good First Issue"
5155
- Post a PR to remove the `TODO` from the code, in favor of the issue.
52-
- `git grep -i "todo"` & `git grep -i "fixme"`
56+
- `git grep -iE "(todo)|(fixme)"`
5357
- Look through all [open trin issues](https://github.com/ethereum/trin/issues)
5458
- Close outdated issues, with a short explanation
5559
- If appropriate, add a Flamingo tag

0 commit comments

Comments
 (0)