Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Add generation of model/emoji_data.go to make-emojis script #3429

Merged
merged 10 commits into from
Aug 26, 2019

Conversation

ethervoid
Copy link
Contributor

@ethervoid ethervoid commented Aug 13, 2019

Summary

This PR includes the generation of the emoji_data.go file into the utils\server folder and it also adds the possibility to override the current file in the server folder.

Ticket Link

Fixes mattermost/mattermost#8566

Related Pull Requests

None

This variable is used by make-emojis in order to overwrite the
server emoji_data.go file in case is defined
Emoji aliases seem to have duplicates and that doesn't work in the case
of the emoji_data.go because you can't have duplicated keys in a map
literal: `duplicate key "blonde_woman_light_skin_tone" in map literal`
@ethervoid ethervoid changed the title Mm 9927 Add generation of model/emoji_data.go to make-emojis script Aug 13, 2019
Added test to check wheter a name for a cusomt icon already exists as
a system icon
Copy link
Member

@hmhealey hmhealey left a comment

Choose a reason for hiding this comment

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

Looks great! I just have a couple questions about the temporary files, but the rest of this looks good.

Makefile Outdated Show resolved Hide resolved
build/emoji/make-emojis Outdated Show resolved Hide resolved
build/emoji/make-emojis Outdated Show resolved Hide resolved
@hmhealey hmhealey added the 2: Dev Review Requires review by a core commiter label Aug 13, 2019
@hmhealey hmhealey requested a review from mkraft August 13, 2019 14:48
@hmhealey hmhealey added this to the v5.16.0 milestone Aug 13, 2019
@ethervoid
Copy link
Contributor Author

ethervoid commented Aug 13, 2019

@hmhealey changes made :)

Also I added an E2E test

@hanzei hanzei requested a review from hmhealey August 13, 2019 23:47
@ethervoid
Copy link
Contributor Author

Seems like the build-docker is stuck in blocked state :\

Copy link
Member

@hmhealey hmhealey left a comment

Choose a reason for hiding this comment

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

Thanks! Tested this out and it generates the file and puts it in the right spot. I did get an error later on in the script, but that happens on master as well, so I might not have something set up correctly on my end

@hmhealey
Copy link
Member

I tried to restart the build where it got stuck, but if that doesn't work, it might help to merge in the latest master branch. We've had some infrastructure changes lately, so this branch might be caught in the middle of them

@ethervoid
Copy link
Contributor Author

@hmhealey now seems to be working hehehe

@hmhealey hmhealey added 4: Reviews Complete All reviewers have approved the pull request Awaiting Submitter Action Blocked on the author and removed 2: Dev Review Requires review by a core commiter Awaiting Submitter Action Blocked on the author labels Aug 23, 2019
@hmhealey
Copy link
Member

Thanks again for the change, @ethervoid! Just waiting for this to rebuild, and then we should be good to merge it

@hmhealey hmhealey merged commit c854c60 into mattermost:master Aug 26, 2019
@ethervoid ethervoid deleted the MM-9927 branch August 27, 2019 09:51
@lindy65 lindy65 removed the 4: Reviews Complete All reviewers have approved the pull request label Aug 28, 2019
@lindy65 lindy65 added the Tests/Not Needed Does not require new release tests label Aug 28, 2019
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Sep 17, 2019
skheria pushed a commit to uber-archive/mattermost-webapp that referenced this pull request Oct 3, 2019
…most#3429)

* Build emoji_data.go file using make-emojis scripts

mattermost/mattermost#8566

* Add SERVER_DIR environment variable

This variable is used by make-emojis in order to overwrite the
server emoji_data.go file in case is defined

* Remove duplicity in the emoji_data.go file

Emoji aliases seem to have duplicates and that doesn't work in the case
of the emoji_data.go because you can't have duplicated keys in a map
literal: `duplicate key "blonde_woman_light_skin_tone" in map literal`

* Fix typo in the comments

* Added E2E test for custom emojis backend

Added test to check wheter a name for a cusomt icon already exists as
a system icon

* Fix typo introduced in the Makefile

Co-Authored-By: Harrison Healey <[email protected]>

* Generate the emoji_data.go file into the root folder

* Move the emoji_data.go file to the server folder instead of copy

* Fix typo in the emoji_data.go output message
skheria pushed a commit to uber-archive/mattermost-webapp that referenced this pull request Oct 3, 2019
…most#3429)

* Build emoji_data.go file using make-emojis scripts

mattermost/mattermost#8566

* Add SERVER_DIR environment variable

This variable is used by make-emojis in order to overwrite the
server emoji_data.go file in case is defined

* Remove duplicity in the emoji_data.go file

Emoji aliases seem to have duplicates and that doesn't work in the case
of the emoji_data.go because you can't have duplicated keys in a map
literal: `duplicate key "blonde_woman_light_skin_tone" in map literal`

* Fix typo in the comments

* Added E2E test for custom emojis backend

Added test to check wheter a name for a cusomt icon already exists as
a system icon

* Fix typo introduced in the Makefile

Co-Authored-By: Harrison Healey <[email protected]>

* Generate the emoji_data.go file into the root folder

* Move the emoji_data.go file to the server folder instead of copy

* Fix typo in the emoji_data.go output message
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation Tests/Not Needed Does not require new release tests
Projects
None yet
5 participants