Opened 6 weeks ago

Closed 3 weeks ago

Last modified 3 weeks ago

#29391 closed enhancement (fixed)

Put git branch-maintenance scripts into scripts directory

Reported by: nickm Owned by: nickm
Priority: Low Milestone: Tor: 0.4.0.x-final
Component: Core Tor/Tor Version:
Severity: Normal Keywords: 040-can asn-merge
Cc: Actual Points: 0
Parent ID: Points:
Reviewer: nickm Sponsor:

Description

There are two scripts that David and I have been using to merge stuff to old branches. Now that more people are getting on on the act, let's put them under version control.

Child Tickets

Change History (18)

comment:1 Changed 6 weeks ago by nickm

Status: assignedneeds_review

See branch ticket29391 with PR at https://github.com/torproject/tor/pull/686 .

comment:2 Changed 6 weeks ago by rl1987

Perhaps let's use .sh extensions for the new script files, so that they are covered by shellcheck on Travis?

comment:3 Changed 6 weeks ago by asn

BTW, I think that David has made various improvements in these scripts while he was using them. Perhaps we can add David as the reviewer here in the next review assignments and he can post his revisions.

comment:4 Changed 5 weeks ago by dgoulet

Reviewer: dgoulet

comment:5 Changed 5 weeks ago by dgoulet

Reviewer: dgouletnickm

Here are my enhance scripts: https://github.com/torproject/tor/pull/703

asn just deployed them and seems working properly for him. I've been using them for a while now.

The entire merging process is _not_ documented whatsoever so this is based on "what I know" so far on how to merge ;).

comment:6 Changed 5 weeks ago by nickm

David's versions are much better than mine. Let's take them and iterate based on that.

Two things to check first:

1) Should they end with .sh, per rl1987's suggestion above?
2) Do they pass shellcheck?

comment:7 Changed 4 weeks ago by dgoulet

Keywords: 040-can added
Priority: MediumLow

Bug triage of 0.4.0 tickets. These are now in the "CAN" section. Lower priority than "040-must".

comment:8 Changed 4 weeks ago by nickm

Status: needs_reviewmerge_ready

LGTM now. Either right before or after merge, we should add 0.4.0. Shortly after that, we should remove 0.3.3.

comment:9 Changed 3 weeks ago by nickm

Keywords: asn-merge added

comment:10 Changed 3 weeks ago by asn

Status: merge_readyneeds_revision

I guess we need to add 040 before merging right? David is this something you can do?
Also, does this need a changes file?

comment:11 in reply to:  10 ; Changed 3 weeks ago by teor

Replying to asn:

I guess we need to add 040 before merging right? David is this something you can do?

We need to add 040 because it's now a separate branch.

We should remove 033 *after* 28 February:
https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/CoreTorReleases
(Which probably means a separate ticket.)

Also, does this need a changes file?

Yes.

comment:12 in reply to:  11 ; Changed 3 weeks ago by dgoulet

Replying to teor:

Replying to asn:

I guess we need to add 040 before merging right? David is this something you can do?

We need to add 040 because it's now a separate branch.

So this is the part that gets annoying, we need to update that script at every new and EOL version... If one day we can figure out a way to automate this part by somehow flagging a git branch (no idea how...) that it is EOL, then we could do that automatically and less error prone from any of us messing up because we forgot to update the scripts.

I'll do the changes in a jiffy for 040.

comment:13 Changed 3 weeks ago by dgoulet

Status: needs_revisionneeds_review

With changes file and 040 and rebased on latest master: ticket29391_041_01

comment:14 Changed 3 weeks ago by nickm

Status: needs_reviewmerge_ready

still lgtm

comment:16 Changed 3 weeks ago by asn

Resolution: fixed
Status: merge_readyclosed

Merged to master!

comment:17 in reply to:  12 Changed 3 weeks ago by teor

Replying to dgoulet:

Replying to teor:

Replying to asn:

I guess we need to add 040 before merging right? David is this something you can do?

We need to add 040 because it's now a separate branch.

So this is the part that gets annoying, we need to update that script at every new and EOL version... If one day we can figure out a way to automate this part by somehow flagging a git branch (no idea how...) that it is EOL, then we could do that automatically and less error prone from any of us messing up because we forgot to update the scripts.

We could add a (UTC) expiry date for each branch.

I'll open tickets for expiry dates and removing 0.3.3 when I do my ticket-opening sprint later today.

comment:18 Changed 3 weeks ago by teor

The tickets are #29605 and #29606.

Note: See TracTickets for help on using tickets.