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

Update Metadata + Screenshots of Activities- GCI task #1

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

mayankkuthar
Copy link

No description provided.

@quozl
Copy link

quozl commented Nov 5, 2018

Thanks. You correctly tried to update the metadata and screenshots, but these changes should have been done in another repository. This repository here was created by mistake from a bundle without checking for the original repository.

Please rework your changes against the other repository.

I'll be deleting this repository.

You may be disappointed; don't be. Your actions have identified a different problem than the one you sought to fix. We do have guidance for maintaining activities that correctly mentions;

Most activity repositories can be found in our GitHub sugarlabs organization.
A few activity repositories are somewhere else; read the activity/activity.info file, check the metadata on the activities.sugarlabs.org app store, or the Activity page on wiki.sugarlabs.org, or our deprecated gitorious instance.

If someone gave you a direct think to this repository, they missed this risk.

@quozl
Copy link

quozl commented Nov 5, 2018

Please rework your changes against the branch reverse in the new repository https://github.com/sugarlabs/LOLActivity

  • clone the repository,
  • switch to the reverse branch, e.g. git checkout reverse,
  • create a new branch for your changes, e.g.git checkout -b metedata.
  • apply your changes,
  • clone on GitHub and push to your repository on GitHub,
  • make a pull request against the base repository https://github.com/llaske/LOLActivity

Thanks!

@Aniket21mathur
Copy link

@quozl can I complete this pull request by doing the changes you mentioned?

@quozl
Copy link

quozl commented Jan 17, 2019

Sure. I've added you as a collaborator. That means you can push commits to the branch associated with this pull request, Gabbar8055:master. Like so;

git clone [email protected]:sugarlabs/last-one-loses-activity
cd last-one-loses-activity
git remote add Gabbar8055 [email protected]:Gabbar8055/last-one-loses-activity
git fetch Gabbar8055
... make your changes and commit
git push Gabbar8055

It has been made a little unusual because @Gabbar8055 did use master instead of a fresh branch.

@Aniket21mathur
Copy link

Thanks for adding me as a collaborator. I will start working on this pull request soon!

@Aniket21mathur
Copy link

@quozl I first forked the LOLActivity cloned it, made the changes @Gabbar8055 made pushed them to a new branch taking reverse as the base branch, and ready to create a pull request to llaske/LOLActivity.But since @Gabbar8055 made the changes how do I credit him?

@quozl
Copy link

quozl commented Jan 24, 2019

Easiest is to examine the patch made by @Gabbar8055 using git log to find the author name and e-mail address, and then use git commit --author or git commit --amend --author to set the same author. That's if you are taking commits at a time from @Gabbar8055's work. If you are combining changes in another person's commit with changes of your own in a new commit, and the majority of the change is yours, you would use the default author (you) and add a "Co-authored-by: " tag to the commit message to acknowledge their work. Search for examples of commit message tags used by this and other projects.

@Aniket21mathur
Copy link

@quozl I opened a pull request against the base repository. Surprisingly there was one of your commit
"Reverse back Sugarizer update" in the reverse branch which was not merged into the base repository so it was also requested to be merged in the pull request along with the above change.Please have a look into it.Thanks!

@quozl
Copy link

quozl commented Jan 25, 2019

Nothing I can do there, it's not a repository I can review on. Yes, I see now that I had made a pull request at the same time as I first answered on this pull request.

My guess is that @llaske is maintaining the activity in a directory inside the Sugarizer repository, and has no need for pull requests to the older repository. Sugarizer doesn't need screenshots and metadata updates.

The activity works on Sugarizer now. If you can make the activity work on Sugar and Sugarizer, then please do. Once we see what you need to do to make that happen, we can figure out where it should be stored.

@llaske
Copy link

llaske commented Jan 25, 2019

You're right @quozl , Last One Loses activity is now maintain directly into Sugarizer.
Plus, in the latest Sugarizer version, the activity rely on Sugarizer presence (llaske/sugarizer#254) so I'm afraid it will no longer be able to run in Sugar.

@quozl
Copy link

quozl commented Jan 26, 2019

Thanks. So maintenance of the Sugar activity can include merging any non-Sugarizer-presence changes. For this pull request here, I'm not interested in merging screenshots and metadata without the activity being tested and working on Sugar.

@tony37
Copy link

tony37 commented Jan 26, 2019 via email

@llaske
Copy link

llaske commented Jan 26, 2019

The version currently deployed on Sugar store is not broken.
But the version included with Sugarizer use features supported by Sugarizer (Presence) not compatible with Sugar.

@quozl
Copy link

quozl commented Jan 28, 2019

Tony wrote:

How is it possible for Lionel to break a Sugar activity?

By adding a collaboration feature that only works on Sugarizer; and he is entitled to do so, it's open source. We lack the feature on Sugar. Porting the feature to Sugar would require work on sugar-web and there is no maintainer or anyone willing to do the work.

@tony37
Copy link

tony37 commented Jan 28, 2019 via email

@quozl
Copy link

quozl commented Jan 28, 2019

Thanks for your interest. Sugarizer is released from and maintained by Lionel in his own repository. The pull request that he accepted is associated with his own repository; see llaske/sugarizer#254. Sugar Labs has a fork of the repository, but we don't take pull requests, because we don't have anyone willing to maintain an operating fork of Sugarizer.

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

Successfully merging this pull request may close these issues.

5 participants