870094 - hacks.mozilla.org: change push script from svn to git

Status: RESOLVED FIXED

(Infrastructure & Operations Graveyard :: WebOps: Other, task, P1)

Description

[Luke Crouch [:groovecoder]]

We do our work on the hacks.mozilla.org theme at https://github.com/mozilla/mozhacks/tree/master now.

We should change the push script to deploy the theme files from there instead of SVN.

Comment 1

[Chris Turra [:cturra]]

currently the entire wp-content directory is managed through svn. 

  http://svn.mozilla.org/projects/hacks.mozilla.org/trunk/wp-content/


due to a conflict in names, this will cause us some issues with shared svn/git repos. would it be possible to rename your Hacks2010 theme in github to something different? maybe Hacks2013?

Comment 2

[Luke Crouch [:groovecoder]]

I defer to Craig - not sure if WordPress installs themes based on directory names?

Comment 3

[Craig Cook (:craigcook)]

(In reply to Luke Crouch [:groovecoder] from comment #2)
> I defer to Craig - not sure if WordPress installs themes based on directory
> names?

It does. Renaming the directory would just treat this as a separate theme, which is perfectly fine. We'll want to update the name in style.css as well. Then just do a push to deploy the "new" Hacks2013 theme and activate it on dev/stage/prod since Hacks2010 would still be there. Sounds like a plan to me.

That way any future fixes would happen in Hacks2013 on git and the Hacks2010 theme can be retired.

In the near future there'll be a fully redesigned theme, which should start in a new folder with a different name when the time comes.

Comment 4

[Craig Cook (:craigcook)]

I filed https://github.com/mozilla/mozhacks/pull/12 yesterday for the renaming, so once that's merged I think we'll be all set to flip the switch.

Comment 5

[Luke Crouch [:groovecoder]]

We have to flip two switches here, right? 1. Merge that code 2. change the push script to use git. And we need to flip them in that order? Are there any outstanding mozhacks pull requests we should merge and push BEFORE we change this stuff up?

Comment 6

[Craig Cook (:craigcook)]

(In reply to Luke Crouch [:groovecoder] from comment #5)
> We have to flip two switches here, right? 1. Merge that code 2. change the
> push script to use git. And we need to flip them in that order? 

Yeah, I think we need to do the renaming before we can update the deployment script, definitely before we actually try to RUN the deployment script.

> Are there any outstanding mozhacks pull requests we should merge and 
> push BEFORE we change this stuff up?

No other PRs currently. Davidwalsh had one for adding IDs to the author list but I merged that already. It hasn't been pushed yet so it will be part of the first push from git.

Comment 7

[Luke Crouch [:groovecoder]]

Merged https://github.com/mozilla/mozhacks/pull/12.

We need to test this on dev/stage first. And make sure we *don't* clear out what's already in place from SVN - we just want to add the Hacks2013 theme from git.

Comment 8

[Chris Turra [:cturra]]

i have created a seperate wp-content directory, which contains the Hacks2013 theme and symlinked it into place. 

[[e-mail]1 themes]# ls -l Hacks2013
lrwxrwxrwx 1 root root 37 May 21 13:52 Hacks2013 -> ../../wp-content-git/themes/Hacks2013

additionally, i have updated the `update` script to do git fetch from origin/master on github/mozhacks. 

please give this a test in dev and let me know when you want this same change pushed to stage.

Comment 9

[Luke Crouch [:groovecoder]]

I don't have the admin user/pw for hacks-dev.allizom.org. Can someone send it to me?

Comment 10

[Chris Turra [:cturra]]

i didn't have a login either, which was actually why i was hoping you could help test for me. according to the wp_user table in the database you do have one:

 mysql> select user_login,user_email from wp_users where user_login='groovecoder'\G
 *************************** 1. row ***************************
 user_login: groovecoder
 user_email: [e-mail]
 1 row in set (0.00 sec)


:groovecoder - could you please help track down someone that does indeed have access to -dev for us?

Comment 11

[Luke Crouch [:groovecoder]]

yup, I found it. dev looks good. let's try stage.

Comment 12

[Chris Turra [:cturra]]

(In reply to Luke Crouch [:groovecoder] from comment #11)
> yup, I found it. dev looks good. let's try stage.

i have pushed this to stage now and :craigcook got me access to the environment to enable the theme for you. please go ahead and give it a review.

Comment 13

[Luke Crouch [:groovecoder]]

worksforme. I'm ready to try prod now.

Comment 14

[Chris Turra [:cturra]]

i have pushed this change to prod as requested, but will leave it up to you fine folks to enable the new theme.

Comment 15

[Luke Crouch [:groovecoder]]

I switched it over and it's working fine: https://hacks.mozilla.org/

So now the hacks push script pulls from the github repo now, right? We've got a PR pending to it: https://github.com/mozilla/mozhacks/pull/13