Create 2.0 RC.2

[samreid]

From https://github.com/phetsims/QA/issues/405#issuecomment-525087299

Here are the patches we need for Waves Interference and Waves Intro for the next round of RC testing:

https://github.com/phetsims/wave-interference/issues/430: fixed in master and needs cherry picks https://github.com/phetsims/wave-interference/issues/432: fixed in master and needs cherry picks https://github.com/phetsims/wave-interference/issues/434: fixed in master and needs cherry picks https://github.com/phetsims/wave-interference/issues/437: fixed in master and needs cherry picks https://github.com/phetsims/wave-interference/issues/438: fixed in master and needs cherry picks https://github.com/phetsims/wave-interference/issues/440: fixed in master and needs cherry picks

[samreid]

The patched SHAs should be shared by both Wave Interference and Waves Intro. I asked how this could be accomplished in https://github.com/phetsims/wave-interference/issues/430#issuecomment-522175552 and @pixelzoom responded:

For derivate sims, I have not created a branch of the parent sim dependency.

cd perennial
grunt checkout-target --repo=waves-intro --target=1.0
cd wave-interference 
git checkout —branch=2.0
cd waves-intro
grunt
// test build here
cp build/phet/dependencies.json .
git add dependencies.json
git commit -m ${{MESSAGE}}
git push origin 1.0

[samreid]

Each issue had a one-commit resolution. Here is the log of cherry-picks on the 2.0 branch:

~/github/wave-interference$ git cherry-pick 6acd70014a7818045196ed645fdf15ea34fd0c72
[2.0 481218c] Reset the play tone checkbox, see https://github.com/phetsims/wave-interference/issues/430
 Date: Fri Aug 16 16:44:04 2019 -0600
 1 file changed, 1 insertion(+)
~/github/wave-interference$ git cherry-pick 4ce28894c3c01238b78010f01fa1a6451b2b73b6
[2.0 7af2029] I18n for none and lots, see https://github.com/phetsims/wave-interference/issues/432
 Date: Fri Aug 16 17:05:54 2019 -0600
 2 files changed, 10 insertions(+), 2 deletions(-)
~/github/wave-interference$ git cherry-pick a0a15cc4500ca34f6fec065cebb21ce192894883
[2.0 e9092d1] Move ResetAllButton to the back layer, see https://github.com/phetsims/wave-interference/issues/434
 Date: Mon Aug 19 10:47:51 2019 -0600
 1 file changed, 2 insertions(+), 4 deletions(-)
~/github/wave-interference$ git cherry-pick e0a922819b127d4bfb9162d457083b4b6f6e0188
[2.0 dd19e6c] Set pulseFiringProperty.value to false when changing disturbanceTypeProperty, see https://github.com/phetsims/wave-interference/issues/437
 Date: Thu Aug 29 22:36:03 2019 -0600
 1 file changed, 1 insertion(+)
~/github/wave-interference$ git cherry-pick 489964122de71390c7a05050b24abe1cfe92bec7
[2.0 9e60b60] Extend touch area for Play Tone checkbox, see https://github.com/phetsims/wave-interference/issues/438
 Date: Mon Aug 26 16:53:59 2019 -0600
 1 file changed, 5 insertions(+)
~/github/wave-interference$ git cherry-pick 044bacb0be806de0fb38d6cc3b50583f909883b2
[2.0 cb784b9] Increase maxWidth for some control panel elements, see https://github.com/phetsims/wave-interference/issues/438
 Date: Mon Aug 26 17:28:17 2019 -0600
 3 files changed, 12 insertions(+), 10 deletions(-)

[samreid]

I pushed the cherry-picks to the 2.0 remote branch. I deployed RC.2 and tested each of the 6 issues. 2.0.0-rc.2 was published here: https://phet-dev.colorado.edu/html/wave-interference/2.0.0-rc.2/phet/wave-interference_en_phet.html

[samreid]

While working on the SHAs for wave-interference, I noticed two discrepancies.

Wave Interference has joist e7752be56aa1a191e10143f141f569837edb83b1 scenery-phet 441f7609a5eb69d9def891b3ff3184df1fc5a91f

whereas Waves Intro has: joist c4b996820dfc39edae54c5f5f386ff37bf8e7956 scenery-phet ef9ff6589ccb4788602b1262c3923fa4bed6bc03

I created these from the same SHAs and am puzzled to see deviation. Perhaps it is a consequence of the maintenance release process? I noticed the Waves Intro listed "branch": "waves-intro-1.0" for both of the changes. I'll compare the SHAs to try to see what's happening.

[samreid]

It looks like https://github.com/phetsims/phet-ios-app/issues/508 was not addressed for Wave Interference 2.0 branch. This invalidates RC.2 which was published above.

UPDATE: I'll want to double check that's what's happening. But if that is the case, why was Wave Interference 2.0 missed in maintenance releases and what else could have been missed? Specifically, (a) which other patches may wave-interference:2.0 have missed and (b) what other sims may have recent maintenance releases missed?

[samreid]

I checked both joist SHAs and they do contain the fixes for https://github.com/phetsims/phet-ios-app/issues/508.

@jonathanolson wrote:

https://github.com/phetsims/wave-interference/commits/2.0 seems to show an update dependencies commit for that one patch https://github.com/phetsims/joist/tree/wave-interference-2.0 seems to show the patch, maybe I’m not understanding what the problem is?

I wrote:

I created Waves Intro and Wave Interference based on the same SHAs. Now, after maintenance releases, they have different shas for Joist and Scenery-phet. I did a content-based diff and the contents are equal. So I’m wondering why the SHAs are different? Should I rectify the SHAs in the dependencies.jsons or leave them as they are?

@jonathanolson replied:

That’s expected, the cherry picks happen at different times, so they are essentially different commits

I believe I had a false reading from the way I tried to do a diff before. It seems we are OK to proceed and RC.2 is still OK.

[samreid]

Here are the RC's

https://phet-dev.colorado.edu/html/wave-interference/2.0.0-rc.2/phet/wave-interference_en_phet.html https://phet-dev.colorado.edu/html/waves-intro/1.0.0-rc.4/phet/waves-intro_en_phet.html

I'll create a QA issue: https://github.com/phetsims/QA/issues/424

[samreid]

RCs created and QA issue created, closing.