Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

📖 add AMP emoji conventional changelogs #13037

Merged
merged 2 commits into from
Feb 5, 2018

Conversation

erwinmombay
Copy link
Member

@erwinmombay erwinmombay commented Jan 25, 2018

added conventional changelog emoji suggestions for PR commits.

feel free to bikeshed.

@erwinmombay erwinmombay force-pushed the add-pr-emoji branch 3 times, most recently from edf3868 to d2ee37d Compare January 25, 2018 20:39
@erwinmombay erwinmombay force-pushed the add-pr-emoji branch 2 times, most recently from 138dd63 to dbfd54f Compare January 25, 2018 20:42
@erwinmombay erwinmombay changed the title add AMP emoji conventional changelogs 📖 add AMP emoji conventional changelogs Jan 25, 2018
@erwinmombay erwinmombay changed the title 📖 add AMP emoji conventional changelogs 🐛 📖 add AMP emoji conventional changelogs Jan 25, 2018
@erwinmombay erwinmombay changed the title 🐛 📖 add AMP emoji conventional changelogs add AMP emoji conventional changelogs Jan 25, 2018
@erwinmombay erwinmombay force-pushed the add-pr-emoji branch 2 times, most recently from 2b28e89 to 05d6cee Compare January 25, 2018 20:44
@erwinmombay
Copy link
Member Author

@cramforce should we add something like https://github.com/commitizen/cz-cli to automate this process?

@dreamofabear
Copy link

Should we add these to PR titles so they're in the squash commits? Or just for commits within a single PR?

@erwinmombay
Copy link
Member Author

erwinmombay commented Jan 25, 2018

@choumx looks like subject isn't supported. My original thinking was just sorta require this on subjects instead of all commits but it doesn't seem to work

@erwinmombay erwinmombay force-pushed the add-pr-emoji branch 2 times, most recently from 697c7eb to 2356d67 Compare January 25, 2018 20:56
@rsimha
Copy link
Contributor

rsimha commented Jan 25, 2018

@erwinmombay @choumx If this is enforced, it should be for PR (and squash commit) titles, since they show up in places like https://github.com/ampproject/amphtml/commits/master and https://travis-ci.org/ampproject/amphtml/builds. I'm not sure it's a good idea to enforce the use of emoji for individual commit messages, as that can get cumbersome very fast.

@erwinmombay
Copy link
Member Author

erwinmombay commented Jan 25, 2018

@rsimha-amp titles/subject emoji is not supported in github (see subject above). but it's still useful during the squash.

@erwinmombay erwinmombay changed the title add AMP emoji conventional changelogs 📖 add AMP emoji conventional changelogs Jan 25, 2018
Copy link
Contributor

@rsimha rsimha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did someone say bikeshed? :)

@@ -16,3 +16,20 @@ Bullet points like
really help with making this more readable.

Fixes/Closes/Related-to #1 (enter issue number, except in rare cases where none exists).

It is also helpful to add an emoji before the commit message to identify the kind of work done on a single commit. See the following suggestions below:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the idea to select one emoji? Or all that are applicable?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well ideally you should be doing one thing with commits (of course i understand in practice this doesn't happen), so either way.

- :exclamation: - (exclamation) tests
- :fire: - (fire) P0
- :rocket: - (rocket) performance improvements
- :lipstick: - (lipstick) css/styling
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there anything other than lipstick that says "style"?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

couldn't find any. open to other suggestions but other conventional changelog use either this or the diamond

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🖍️ (:crayon: seems like a good choice)

- :fire: - (fire) P0
- :rocket: - (rocket) performance improvements
- :lipstick: - (lipstick) css/styling
- :wheelchair: - (wheelchair) accessability
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo: accessibility

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed.

- :recycle: - (recycle) refactoring (like moving around code w/o any changes)
- :building_construction: - (building_construction) infrastructure and tooling
- :rewind: - (rewind) revert
- :feelsgood: - (feelsgood) submitting a hacky PR
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be a category of its own?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

haha no idea. this was just for fun

- :building_construction: - (building_construction) infrastructure and tooling
- :rewind: - (rewind) revert
- :feelsgood: - (feelsgood) submitting a hacky PR
- :construction_worker: - (construction_worker) builds/travis related
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be clubbed together with infra and tooling, since they often go together?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm ok with that.

- :rewind: - (rewind) revert
- :feelsgood: - (feelsgood) submitting a hacky PR
- :construction_worker: - (construction_worker) builds/travis related
- :put_litter_in_its_place: - (put_litter_in_its_place) removing code
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe say "code cleanup" instead of "removing code"?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code cleanup is even more ambiguous though right? like a cleanup could be moving code around like refactoring etc.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough :)

@rsimha
Copy link
Contributor

rsimha commented Jan 25, 2018

Full list of available github markdown emoji: https://gist.github.com/rxaviers/7360908#file-gistfile1-md

Edit: This seems like a more useful list: https://gitmoji.carloscuesta.me/

Copy link
Contributor

@cvializ cvializ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚲🏚

- :bug: - (bug) bug fix
- :sparkles: - (sparkles) new feature
- :exclamation: - (exclamation) tests
- :fire: - (fire) P0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔥 is used pretty often for good things, like my mix tape. Maybe 🚨 might be more appropriate?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

true. but fire is easier to remember than rotating_light in an actual P0 situation

- :fire: - (fire) P0
- :rocket: - (rocket) performance improvements
- :lipstick: - (lipstick) css/styling
- :wheelchair: - (wheelchair) accessability
Copy link
Contributor

@cvializ cvializ Jan 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The wheelchair is good because :acc autocompletes to it, but it'd be nice if there was something a little more inclusive of all people with accessibility needs rather than only those with physical disabilities.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any suggestions? I was thinking maybe of 🅰️ ?

Copy link
Contributor

@cvializ cvializ Jan 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🅰️ matches but it's a little plain. 👥 (:users / :busts_in_silhouette:) could be good? Maybe we could call the category usability and accessibility? I'm also ok with ♿, it's more a critique of GitHub that :accessibility only autosuggests just the wheelchair image.

- :rewind: - (rewind) revert
- :feelsgood: - (feelsgood) submitting a hacky PR
- :construction_worker: - (construction_worker) builds/travis related
- :put_litter_in_its_place: - (put_litter_in_its_place) removing code
Copy link
Contributor

@cvializ cvializ Jan 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

- 🌏 or 🌍 or 🌎 - (:earth_asia: or :earth_africa: or :earth_americas:) i18n

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good one!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:international autocompletes to one of these

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets go with the global_with_meridians?

@cramforce
Copy link
Member

So, …, it doesn't work in subjects but then shows up in squash commits? Maybe that is good enough and could be fixed by GH in the future.

- :exclamation: - `:exclamation:` tests
- :fire: - `:fire:` P0
- :rocket: - `:rocket:` performance improvements
- :lipstick: - `:lipstick:` css/styling
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🖍 please for gender neutrality.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will do

Copy link
Member

@mrjoro mrjoro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

None of these comments are required changes. :)


- :bug: - `:bug:` bug fix
- :sparkles: - `:sparkles:` new feature
- :exclamation: - `:exclamation:` tests
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 to 🚲🏠 :)

❗️ looks like something that really needs attention (like a high priority issue); is there something more neutral we can use?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think ✅ (:white_check_mark:) might work here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

- :rocket: - `:rocket:` performance improvements
- :lipstick: - `:lipstick:` css/styling
- :wheelchair: - `:wheelchair:` accessibility
- :globe_with_meridians: - `:globe_with_meridians:` i18n
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add (internationalization) after i18n for people who aren't familiar with the term

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

- :recycle: - `:recycle:` refactoring (like moving around code w/o any changes)
- :building_construction: - `:building_construction:` infrastructure/tooling/builds/CI
- :rewind: - `:rewind:` revert
- :feelsgood: - `:feelsgood:` submitting a hacky PR
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I associate this term with a different meme so I'd prefer something more neutral if possible.

I don't have a great idea; maybe 🐭 for the game Mouse Trap? :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

haha honestly. I'll just remove it. I just added it for giggles 😃

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:feelsgood: is from Doom right?

Copy link
Contributor

@cvializ cvializ Jan 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

feelsgood is also commonly associated with a certain 🐸 https://www.google.com/search?q=feels+good+man

Copy link
Contributor

@rsimha rsimha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(How) are we going to suggest / enforce this? No one reads our documentation after going through first time setup :)


- :bug: - `:bug:` bug fix
- :sparkles: - `:sparkles:` new feature
- :exclamation: - `:white_check_mark:` tests
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should read:

:white_check_mark: - `:white_check_mark:` tests

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

@@ -16,3 +16,19 @@ Bullet points like
really help with making this more readable.

Fixes/Closes/Related-to #1 (enter issue number, except in rare cases where none exists).

It is also helpful to add an emoji before the commit message to identify the kind of work done on a single commit. See the following suggestions belowf
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/belowf/below:/

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

- :recycle: - `:recycle:` refactoring (like moving around code w/o any changes)
- :building_construction: - `:building_construction:` infrastructure/tooling/builds/CI
- :rewind: - `:rewind:` revert
- :put_litter_in_its_place: - `:put_litter_in_its_place:` deleting code
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest capitalizing all the phrases, like:

Bug fix
New feature
Tests

etc.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

@erwinmombay erwinmombay force-pushed the add-pr-emoji branch 3 times, most recently from 5d7c95c to ea4db14 Compare February 1, 2018 20:25
@erwinmombay
Copy link
Member Author

@rsimha-amp i don't think we're looking to enforce this. but there are tools like https://github.com/commitizen/cz-cli and conventional-changelog that does

Copy link
Contributor

@rsimha rsimha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha. LGTM after a few more nits.

- :white_check_mark: - `:white_check_mark:` Tests
- :fire: - `:fire:` P0
- :rocket: - `:rocket:` Performance improvements
- :crayon: - `:crayon:` css/styling
Copy link
Contributor

@rsimha rsimha Feb 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CSS / styling (capitalization, spacing)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

- :rocket: - `:rocket:` Performance improvements
- :crayon: - `:crayon:` css/styling
- :wheelchair: - `:wheelchair:` Accessibility
- :globe_with_meridians: - `:globe_with_meridians:` i18n (internationalization)
Copy link
Contributor

@rsimha rsimha Feb 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i18n (Internationalization) (capitalization)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

- :globe_with_meridians: - `:globe_with_meridians:` i18n (internationalization)
- :book: - `:book:` Documentation
- :recycle: - `:recycle:` Refactoring (like moving around code w/o any changes)
- :building_construction: - `:building_construction:` Infrastructure/Tooling/Builds/CI
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Infrastructure / Tooling / Builds / CI (with spaces)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

@erwinmombay erwinmombay merged commit 910d343 into ampproject:master Feb 5, 2018
protonate pushed a commit to protonate/amphtml that referenced this pull request Feb 26, 2018
* 📖 add AMP emoji conventional changelogs

* apply recommendations
RanAbram pushed a commit to RanAbram/amphtml that referenced this pull request Mar 12, 2018
* 📖 add AMP emoji conventional changelogs

* apply recommendations
protonate pushed a commit to protonate/amphtml that referenced this pull request Mar 15, 2018
* 📖 add AMP emoji conventional changelogs

* apply recommendations
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants