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

Create new stable SHAs #40

Closed
samreid opened this issue Feb 3, 2017 · 18 comments
Closed

Create new stable SHAs #40

samreid opened this issue Feb 3, 2017 · 18 comments

Comments

@samreid
Copy link
Member

samreid commented Feb 3, 2017

From phetsims/circuit-construction-kit-common#72 (comment)

Master has diverged so much from the legacy branch that it is no longer to automatically or semi-automatically merge the changes. All changes now have to be done manually, this means extra work during development and that everything must be tested twice (in the branch and in master). The best long term plan is to abandon the legacy branch and create a new stable branch from master--this would require one-time exhaustive testing but would save us the most time in the long run. Every time we say "what if there is just one more minor change for the stale branch" there are many more changes for the stale branch. So we should plan to stop making changes to this branch soon, whether (a) it requires no more changes or (b) we can use a fresh branch from master.

When we do this will be up to @arouinfar @kathy-phet and @ariel-phet.

@samreid
Copy link
Member Author

samreid commented Feb 3, 2017

One point to refine this, some semi-automatic backports are possible for common feature (i.e. not specific to black box). For instance, I was able to cherry pick some of the fire.

@ariel-phet
Copy link

@samreid in terms of the QA queue next week would probably be a good time, once Make-a-Ten is published, we will likely have a bit of a lull in high priority items for possibly a week or so (especially since the app is now republished, and some recent a11y iO sims are out the door).

So I would say sooner than later, and this task would come above testing a CCK prototype IMO

@ariel-phet ariel-phet removed their assignment Feb 3, 2017
@samreid
Copy link
Member Author

samreid commented Feb 4, 2017

If master makes it through QA, it would also be a suitable prototype.

@arouinfar arouinfar removed their assignment Feb 6, 2017
@arouinfar
Copy link

@samreid I'll defer to @ariel-phet on this issue. My only concern is that we will be able to make the late Feb/early March deadline for Shima's studies.

@ariel-phet ariel-phet assigned samreid and unassigned kathy-phet Feb 6, 2017
@ariel-phet
Copy link

@samreid lets go ahead with creating this task as we have some current space in QA that will soon close up in a week or two

@samreid
Copy link
Member Author

samreid commented Feb 6, 2017

Marked for high priority as a reminder to do this soon.

@samreid
Copy link
Member Author

samreid commented Feb 7, 2017

@arouinfar can I include the component labels like this:

image

and the checkbox:

image

For Shima, or should I strip it out before doing a build?

@arouinfar
Copy link

@samreid I honestly don't know. My best guess would be that you should strip the labels before doing a build for Shima, but I will email her to confirm.

@samreid
Copy link
Member Author

samreid commented Feb 7, 2017

Sounds good, I don't want to miss our testing window, so if you don't hear from her by noon tomorrow or so I'll probably do a build anyways. If we have to strip the labels from the support branch, or add an option to have them off by default it will be OK.

UPDATE: I may wait until end of business Wednesday to create an RC.

@arouinfar
Copy link

@samreid thanks for the update. I'll let you know as soon as I hear back.

@arouinfar
Copy link

@samreid the Labels checkbox (default on) can be included in the version of CCK:BB that you build for Shima.

Shima replied:

Having label for elements in both CCK & CCK-BB are more positive than negative feature. So I am totally fine in having them in CCK-BB tab as well.

When following up about the default state of the Labels checkbox, she said:

default can be on, and then I will switch it off if need be

@arouinfar
Copy link

@samreid I saw CCK:BB on master, and I wanted to give you a heads up that the lifelike/schematic option should not be in what is published for Shima.

@samreid
Copy link
Member Author

samreid commented Feb 7, 2017

Agreed, I'll suppress that before publishing tomorrow.

@arouinfar
Copy link

Excellent, thanks!

samreid added a commit to phetsims/circuit-construction-kit-common that referenced this issue Feb 8, 2017
@samreid
Copy link
Member Author

samreid commented Feb 8, 2017

I commented out the lifelike/schematic buttons for now.

@samreid
Copy link
Member Author

samreid commented Feb 8, 2017

I'll create a 1.1-phetio branch for this. In case significant problems arise, we would still be able to use the 1.0 legacy branch.

samreid added a commit that referenced this issue Feb 8, 2017
@samreid
Copy link
Member Author

samreid commented Feb 17, 2017

After a few RC's the new SHAs are looking much more solid than old shas, thanks @phet-steele and @arouinfar, closing.

@samreid samreid closed this as completed Feb 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

4 participants