From 477e08f7c74a1866bee23c794f9e9dbe5dcebb63 Mon Sep 17 00:00:00 2001 From: Raghu Simha Date: Wed, 29 Jan 2020 13:37:27 -0500 Subject: [PATCH 1/7] =?UTF-8?q?=F0=9F=8F=97=20Update=20Cherry-pick=20templ?= =?UTF-8?q?ate=20with=20new=20release=20names?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR updates the template. Labels used for cherry-pick issues have already been updated. ![image](https://user-images.githubusercontent.com/26553114/73384852-17ce1500-429a-11ea-9791-242f78f7e742.png) Partial fix for #25560 --- .../ISSUE_TEMPLATE/cherry_pick_template.md | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/cherry_pick_template.md b/.github/ISSUE_TEMPLATE/cherry_pick_template.md index b37c6689f6bb..2209972c1c5e 100644 --- a/.github/ISSUE_TEMPLATE/cherry_pick_template.md +++ b/.github/ISSUE_TEMPLATE/cherry_pick_template.md @@ -1,3 +1,13 @@ +--- +name: Cherry-pick template +about: Used to request a cherry-pick. See go.amp.dev/cherry-picks +title: "\U0001F338 Cherry-pick request for # into # (Pending)" +labels: 'Cherry Pick: Beta, Cherry Pick: Experimental, Cherry Pick: Stable, Type: + Release' +assignees: '' + +--- + --- name: Cherry-pick template about: Used to request a cherry-pick. See go.amp.dev/cherry-picks @@ -7,6 +17,7 @@ labels: 'Type: Release' @@ -14,12 +25,12 @@ If you have any questions see the [cherry-pick documentation](https://github.com # Cherry-pick request -| Issue | PR | Production? | RC? | [Release issue](https://github.com/ampproject/amphtml/labels/Type%3A%20Release) | -| :---------------: | :------------: | :----------: | :----------: | :-----------------------------------------------------------------------------: | -| #<_ISSUE_NUMBER_> | #<_PR_NUMBER_> | **** | **** | #<_RELEASE_ISSUE_> | +| Issue | PR | Stable? | Beta / Experimental? | [Release issue](https://github.com/ampproject/amphtml/labels/Type%3A%20Release) | +| :---------------: | :------------: | :----------: | :------------------: | :-----------------------------------------------------------------------------: | +| #<_ISSUE_NUMBER_> | #<_PR_NUMBER_> | **** | **** | #<_RELEASE_ISSUE_> | ## Why does this issue meet the [cherry-pick criteria](https://github.com/ampproject/amphtml/blob/master/contributing/release-schedule.md#cherry-pick-criteria)? @@ -30,15 +41,15 @@ TIP: Be specific. <_YOUR_REASONS_> -## Why is a RC cherry-pick not needed? +## Why is a Beta / Experimental cherry-pick not needed? <_YOUR_REASONS_> From e8a3e37ac7e98b1e9a7ae5e20be9bd435ffb82ee Mon Sep 17 00:00:00 2001 From: Raghu Simha Date: Wed, 29 Jan 2020 13:38:45 -0500 Subject: [PATCH 2/7] Remove duplicate fronttext --- .github/ISSUE_TEMPLATE/cherry_pick_template.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/cherry_pick_template.md b/.github/ISSUE_TEMPLATE/cherry_pick_template.md index 2209972c1c5e..dbf9618eda0a 100644 --- a/.github/ISSUE_TEMPLATE/cherry_pick_template.md +++ b/.github/ISSUE_TEMPLATE/cherry_pick_template.md @@ -8,13 +8,6 @@ assignees: '' --- ---- -name: Cherry-pick template -about: Used to request a cherry-pick. See go.amp.dev/cherry-picks -title: "\U0001F338 Cherry-pick request for # into # (Pending)" -labels: 'Type: Release' ---- - -| Issue | PR | Stable? | Beta / Experimental? | [Release issue](https://github.com/ampproject/amphtml/labels/Type%3A%20Release) | -| :---------------: | :------------: | :----------: | :------------------: | :-----------------------------------------------------------------------------: | -| #<_ISSUE_NUMBER_> | #<_PR_NUMBER_> | **** | **** | #<_RELEASE_ISSUE_> | +| Issue | PR | Beta / Experimental? | Stable? | LTS? | [Release issue](https://github.com/ampproject/amphtml/labels/Type%3A%20Release) | +| :---------------: | :------------: | :------------------: | :----------: | :----------: | ------------------------------------------------------------------------------- | +| #<_ISSUE_NUMBER_> | #<_PR_NUMBER_> | **** | **** | **** | #<_RELEASE_ISSUE_> | ## Why does this issue meet the [cherry-pick criteria](https://github.com/ampproject/amphtml/blob/master/contributing/release-schedule.md#cherry-pick-criteria)? @@ -40,6 +41,14 @@ CONDITION: Cherry-picking into Stable but _not_ Beta / Experimental. Otherwise, <_YOUR_REASONS_> + + +## Why is an LTS cherry-pick needed? + +<_YOUR_REASONS_> + # Cherry-pick request From e6064f09ced42328bfd481a4ec83cb1277dc2450 Mon Sep 17 00:00:00 2001 From: Raghu Simha Date: Wed, 29 Jan 2020 15:16:47 -0500 Subject: [PATCH 6/7] Fix template name --- .github/ISSUE_TEMPLATE/cherry_pick_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/cherry_pick_template.md b/.github/ISSUE_TEMPLATE/cherry_pick_template.md index fd5d5817a9c6..0688572fd6f4 100644 --- a/.github/ISSUE_TEMPLATE/cherry_pick_template.md +++ b/.github/ISSUE_TEMPLATE/cherry_pick_template.md @@ -1,5 +1,5 @@ --- -name: Cherry-pick template +name: Cherry-pick request about: Used to request a cherry-pick. See go.amp.dev/cherry-picks title: "\U0001F338 Cherry-pick request for # into # (Pending)" labels: From 94c7b2f9e7c2af72c570581f3a722da3c8c1caba Mon Sep 17 00:00:00 2001 From: Raghu Simha Date: Wed, 29 Jan 2020 15:57:14 -0500 Subject: [PATCH 7/7] Format label names --- .github/ISSUE_TEMPLATE/cherry_pick_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/cherry_pick_template.md b/.github/ISSUE_TEMPLATE/cherry_pick_template.md index 0688572fd6f4..71def2448db0 100644 --- a/.github/ISSUE_TEMPLATE/cherry_pick_template.md +++ b/.github/ISSUE_TEMPLATE/cherry_pick_template.md @@ -3,7 +3,7 @@ name: Cherry-pick request about: Used to request a cherry-pick. See go.amp.dev/cherry-picks title: "\U0001F338 Cherry-pick request for # into # (Pending)" labels: - 'Cherry Pick: Beta, Cherry Pick: Experimental, Cherry Pick: LTS, Cherry Pick: Stable, Type: + 'Cherry-pick: Beta, Cherry-pick: Experimental, Cherry-pick: LTS, Cherry-pick: Stable, Type: Release' assignees: '' ---