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

Upgrade buttonweavers site to Ubuntu Xenial #2413

Merged
merged 1 commit into from
Nov 14, 2018

Conversation

cgolubi1
Copy link
Contributor

@cgolubi1
Copy link
Contributor Author

I just opted to redo the branch so i didn't have to worry about merge issues and teasing out Shadowshade's changes that i had rebased in. I think this version has the right stuff in it:

$ diff -r --brief buttonmen-2398_site_upgrade buttonmen-2398_site_upgrade_redo | grep -v '/.git/' | grep -v '/.git: ' | grep -v /dummy_data/ | grep -v /.vagrant/ | grep -v .pyc
Files buttonmen-2398_site_upgrade/deploy/vagrant/Vagrantfile and buttonmen-2398_site_upgrade_redo/deploy/vagrant/Vagrantfile differ
Only in buttonmen-2398_site_upgrade_redo/deploy/vagrant: ubuntu-xenial-16.04-cloudimg-console.log
Files buttonmen-2398_site_upgrade/src/engine/BMAttack.php and buttonmen-2398_site_upgrade_redo/src/engine/BMAttack.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMButton.php and buttonmen-2398_site_upgrade_redo/src/engine/BMButton.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMDie.php and buttonmen-2398_site_upgrade_redo/src/engine/BMDie.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMDieTwin.php and buttonmen-2398_site_upgrade_redo/src/engine/BMDieTwin.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMEmail.php and buttonmen-2398_site_upgrade_redo/src/engine/BMEmail.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMGame.php and buttonmen-2398_site_upgrade_redo/src/engine/BMGame.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMGameAction.php and buttonmen-2398_site_upgrade_redo/src/engine/BMGameAction.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMInterface.php and buttonmen-2398_site_upgrade_redo/src/engine/BMInterface.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMInterfaceGame.php and buttonmen-2398_site_upgrade_redo/src/engine/BMInterfaceGame.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMInterfaceNewuser.php and buttonmen-2398_site_upgrade_redo/src/engine/BMInterfaceNewuser.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMPlayer.php and buttonmen-2398_site_upgrade_redo/src/engine/BMPlayer.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMSkillMaximum.php and buttonmen-2398_site_upgrade_redo/src/engine/BMSkillMaximum.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMSkillMighty.php and buttonmen-2398_site_upgrade_redo/src/engine/BMSkillMighty.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMSkillTimeAndSpace.php and buttonmen-2398_site_upgrade_redo/src/engine/BMSkillTimeAndSpace.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMSkillTrip.php and buttonmen-2398_site_upgrade_redo/src/engine/BMSkillTrip.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMSkillTurbo.php and buttonmen-2398_site_upgrade_redo/src/engine/BMSkillTurbo.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMSkillWeak.php and buttonmen-2398_site_upgrade_redo/src/engine/BMSkillWeak.php differ
Files buttonmen-2398_site_upgrade/src/engine/BMUtilityHitTable.php and buttonmen-2398_site_upgrade_redo/src/engine/BMUtilityHitTable.php differ
Files buttonmen-2398_site_upgrade/test/src/engine/BMButtonTest.php and buttonmen-2398_site_upgrade_redo/test/src/engine/BMButtonTest.php differ
Files buttonmen-2398_site_upgrade/test/src/engine/BMDieOptionTest.php and buttonmen-2398_site_upgrade_redo/test/src/engine/BMDieOptionTest.php differ
Files buttonmen-2398_site_upgrade/test/src/engine/BMGameTest.php and buttonmen-2398_site_upgrade_redo/test/src/engine/BMGameTest.php differ
Files buttonmen-2398_site_upgrade/test/src/engine/BMInterfaceGameTest.php and buttonmen-2398_site_upgrade_redo/test/src/engine/BMInterfaceGameTest.php differ
Files buttonmen-2398_site_upgrade/test/src/engine/BMInterfaceTest.php and buttonmen-2398_site_upgrade_redo/test/src/engine/BMInterfaceTest.php differ
Files buttonmen-2398_site_upgrade/test/src/engine/BMSkillBerserkTest.php and buttonmen-2398_site_upgrade_redo/test/src/engine/BMSkillBerserkTest.php differ
Files buttonmen-2398_site_upgrade/test/src/engine/BMSkillRadioactiveTest.php and buttonmen-2398_site_upgrade_redo/test/src/engine/BMSkillRadioactiveTest.php differ
Files buttonmen-2398_site_upgrade/test/src/engine/BMSkillRageTest.php and buttonmen-2398_site_upgrade_redo/test/src/engine/BMSkillRageTest.php differ
Files buttonmen-2398_site_upgrade/test/src/engine/BMSkillTimeAndSpaceTest.php and buttonmen-2398_site_upgrade_redo/test/src/engine/BMSkillTimeAndSpaceTest.php differ

The Vagrantfile changes:

$ diff buttonmen-2398_site_upgrade/deploy/vagrant/Vagrantfile buttonmen-2398_site_upgrade_redo/deploy/vagrant/Vagrantfile
23c23
<   config.vm.hostname = "sandbox.buttonweavers.com"
---
>   #config.vm.hostname = "sandbox.buttonweavers.com"

I'm honestly not sure why that became necessary --- the default virtualbox hostname is now ubuntu-xenial, and it didn't like me setting it to sandbox early in the boot process. I don't think it's a big deal, though, because it's not going to break the running site. Either it'll work or it won't (and right now it does work on virtualbox and on the AWS replay site). Anyway, everything else is Shadowshade's changes from #2411 that we're not bringing in now, and we can tell that i got all of my changes from before, because the unit tests pass.

@cgolubi1
Copy link
Contributor Author

cgolubi1 commented Nov 12, 2018

Schedule:

  • I'd like to merge this tomorrow (Tuesday) during my morning, and stand up a staging site [edit: by which i of course mean "migrate the existing staging site, writing up a migration process as i go"]
  • At that point, we'll ask people to spend some time on the staging site, and when we schedule the actual prod migration will depend on when people are able to do that. This Thursday or Friday is an option if people have time to test and are happy; or next week if things take longer or we see any problems.

@blackshadowshade
Copy link
Contributor

Any reason this doesn't run CircleCI?

@blackshadowshade
Copy link
Contributor

Also, did you mean to include deploy/vagrant/ubuntu-xenial-16.04-cloudimg-console.log?

@cgolubi1 cgolubi1 force-pushed the 2398_site_upgrade_redo branch from 1b169c4 to 6e70186 Compare November 12, 2018 23:55
@cgolubi1
Copy link
Contributor Author

I don't know why it didn't have CircleCI before --- maybe the run was too old.

Anyway, thanks for catching the logfile. I've removed it, and now it is running CircleCI.

@blackshadowshade
Copy link
Contributor

Looks good to me. This is ready to be merged whenever you're ready for it.

@cgolubi1
Copy link
Contributor Author

We're at 5300 new and replayed games with this branch (plus the initial 13000 from what i believe to be the same code), so let's do this.

@cgolubi1 cgolubi1 merged commit a349a86 into buttonmen-dev:master Nov 14, 2018
@cgolubi1 cgolubi1 deleted the 2398_site_upgrade_redo branch November 26, 2018 13:09
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.

2 participants