Skip to content

Commit

Permalink
Merge branch 'master' into advance-rfc-0831
Browse files Browse the repository at this point in the history
  • Loading branch information
kategengler committed Dec 8, 2023
2 parents 281b7ad + 829f508 commit ef7bdd7
Show file tree
Hide file tree
Showing 20 changed files with 816 additions and 44 deletions.
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/advance-to-ready-for-release.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Advance #__RFC_NUMBER__ to the [Ready For Release Stage](https://github.com/emberjs/rfcs#ready-for-release)

## [Rendered](__RFC_RENDERED_URL__)

## Summary

This pull request is advancing the RFC to the [Ready For Release Stage](https://github.com/emberjs/rfcs#ready-for-release).
Expand Down
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/advance-to-recommended.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Advance #__RFC_NUMBER__ to the [Recommended Stage](https://github.com/emberjs/rfcs#recommended)

## [Rendered](__RFC_RENDERED_URL__)

## Summary

This pull request is advancing the RFC to the [Recommended Stage](https://github.com/emberjs/rfcs#recommended).
Expand Down
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/advance-to-released.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Advance #__RFC_NUMBER__ to the [Released Stage](https://github.com/emberjs/rfcs#released)

## [Rendered](__RFC_RENDERED_URL__)

## Summary

This pull request is advancing the RFC to the [Released Stage](https://github.com/emberjs/rfcs#released).
Expand Down
61 changes: 61 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<!-- If you are proposing a new RFC, please fill out the below template.
If not, please remove the below contents
-->

# Propose {{RFC_NAME}}

<!-- Update the below to link to the rendered version of your RFC.
The URL can be interpolated below or can be found by going to the files tab
and choosing `View file' from the `...' menu in the right hand corner of the file. -->

## [Rendered](https://github.com/{{username}}/rfcs/blob/{{branch}}/text/{{rfc_number}}-{{rfc_slug}}.md)

## Summary

This pull request is proposing a new RFC.

To succeed, it will need to pass into the [Exploring Stage](https://github.com/emberjs/rfcs#exploring)), followed by the [Accepted Stage](https://github.com/emberjs/rfcs#accepted).

A Proposed or Exploring RFC may also move to the [Closed Stage](https://github.com/emberjs/rfcs#closed) if it is withdrawn by the author or if it is rejected by the Ember team. This requires an "FCP to Close" period.

**An FCP is required before merging this PR to advance to Accepted.**

Upon merging this PR, automation will open a draft PR for this RFC to move to the [Ready for Released Stage](https://github.com/emberjs/rfcs#ready-for-release).

<details>
<summary>Exploring Stage Description</summary>

This stage is entered when the Ember team believes the concept described in the RFC should be pursued, but the RFC may still need some more work, discussion, answers to open questions, and/or a champion before it can move to the next stage.

An RFC is moved into Exploring with consensus of the relevant teams. The relevant team expects to spend time helping to refine the proposal. The RFC remains a PR and will have an `Exploring` label applied.

An Exploring RFC that is successfully completed can move to [Accepted](https://github.com/emberjs/rfcs#accepted) with an FCP is required as in the existing process. It may also be moved to [Closed](https://github.com/emberjs/rfcs#closed) with an FCP.
</details>

<details>
<summary>Accepted Stage Description</summary>

To move into the "accepted stage" the RFC must have complete prose and have successfully passed through an "FCP to Accept" period in which the community has weighed in and consensus has been achieved on the direction. The relevant teams believe that the proposal is well-specified and ready for implementation. The RFC has a champion within one of the relevant teams.

If there are unanswered questions, we have outlined them and expect that they will be answered before [Ready for Release](https://github.com/emberjs/rfcs#ready-for-release).

When the RFC is accepted, the PR will be merged, and automation will open a new PR to move the RFC to the [Ready for Release](https://github.com/emberjs/rfcs#ready-for-release) stage. That PR should be used to track implementation progress and gain consensus to move to the next stage.

</details>

## Checklist to move to Exploring

- [ ] The team believes the concepts described in the RFC should be pursued.
- [ ] The label `S-Proposed` is removed from the PR and the label `S-Exploring` is added.
- [ ] The Ember team is willing to work on the proposal to get it to Accepted

## Checklist to move to Accepted

- [ ] This PR has had the `Final Comment Period` label has been added to start the FCP
- [ ] The RFC is announced in #news-and-announcements in the Ember Discord.
- [ ] The RFC has complete prose, is well-specified and ready for implementation.
- [ ] All sections of the RFC are filled out.
- [ ] Any unanswered questions are outlined and expected to be answered before Ready for Release.
- [ ] "How we teach this?" is sufficiently filled out.
- [ ] The RFC has a champion within one of the relevant teams.
- [ ] The RFC has consensus after the FCP period.
7 changes: 4 additions & 3 deletions .github/workflows/open-advancement-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,17 @@ jobs:
ready_for_release_pr=${ready_for_release_pr//\"/}
released_pr=`echo $frontmatter | jq '.prs.released'`
released_pr=${released_pr//\"/}
rendered_rfc_url="https://github.com/$GITHUB_REPOSITORY/blob/advance-rfc-${{ inputs.rfc-number }}/${{ inputs.rfc-path }}"
title=`echo $frontmatter | jq '.title'`
if [[ ${{ inputs.new-stage }} == "ready-for-release" ]]; then
pretty_stage="Ready for Release"
template=`sed -e 's/__RFC_NUMBER__/${{ inputs.rfc-number }}/g' .github/PULL_REQUEST_TEMPLATE/advance-to-ready-for-release.md`
template=`sed -e 's/__RFC_NUMBER__/${{ inputs.rfc-number }}/g' -e "s>__RFC_RENDERED_URL__>$rendered_rfc_url>g" .github/PULL_REQUEST_TEMPLATE/advance-to-ready-for-release.md`
elif [[ ${{ inputs.new-stage }} == "released" ]]; then
pretty_stage="Released"
template=`sed -e 's/__RFC_NUMBER__/${{ inputs.rfc-number }}/g' -e "s>__READY_FOR_RELEASE_PR__>$ready_for_release_pr>g" .github/PULL_REQUEST_TEMPLATE/advance-to-released.md`
template=`sed -e 's/__RFC_NUMBER__/${{ inputs.rfc-number }}/g' -e "s>__READY_FOR_RELEASE_PR__>$ready_for_release_pr>g" -e "s>__RFC_RENDERED_URL__>$rendered_rfc_url>g" .github/PULL_REQUEST_TEMPLATE/advance-to-released.md`
elif [[ ${{ inputs.new-stage }} == "recommended" ]]; then
pretty_stage="Recommended"
template=`sed -e 's/__RFC_NUMBER__/${{ inputs.rfc-number }}/g' -e "s>__READY_FOR_RELEASE_PR__>$ready_for_release_pr>g" -e "s>__RELEASED_PR__>$released_pr>g" .github/PULL_REQUEST_TEMPLATE/advance-to-recommended.md`
template=`sed -e 's/__RFC_NUMBER__/${{ inputs.rfc-number }}/g' -e "s>__READY_FOR_RELEASE_PR__>$ready_for_release_pr>g" -e "s>__RELEASED_PR__>$released_pr>g" -e "s>__RFC_RENDERED_URL__>$rendered_rfc_url>g" .github/PULL_REQUEST_TEMPLATE/advance-to-recommended.md`
fi
echo 'body<<EOF' >> $GITHUB_OUTPUT
echo "$template" >> $GITHUB_OUTPUT
Expand Down
6 changes: 3 additions & 3 deletions text/0566-memo-decorator.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
stage: released # FIXME: This may be recommended
stage: recommended
start-date: 2019-12-22T00:00:00.000Z
release-date: 2021-12-28T00:00:00.000Z
release-versions:
ember-source: v4.1.0

teams:
- framework
prs:
accepted: https://github.com/emberjs/rfcs/pull/566
accepted: 'https://github.com/emberjs/rfcs/pull/566'
recommended: 'https://github.com/emberjs/rfcs/pull/914'
project-link:
---

Expand Down
6 changes: 3 additions & 3 deletions text/0637-customizable-test-setups.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
---
stage: released # FIXME: This may be recommended
stage: recommended
start-date: 2020-06-01T00:00:00.000Z
release-date: 2020-05-02T00:00:00.000Z
release-versions:
ember-source: v4.4.0
ember-cli: v4.3.0

teams:
- framework
- cli
prs:
accepted: https://github.com/emberjs/rfcs/pull/637
accepted: 'https://github.com/emberjs/rfcs/pull/637'
recommended: 'https://github.com/emberjs/rfcs/pull/888'
project-link:
---

Expand Down
Loading

0 comments on commit ef7bdd7

Please sign in to comment.