-
- Hey guys,
-
- After a lot gitlab and git testing/screwing, the continuous integration
- script is finally working.
-
- You will need to:
-
- - Rebase the master branch on your personal branches:
-
- $ git checkout master
- $ git pull origin master
- $ git checkout replaceafill/novalaciro_cms
- $ git rebase master
-
- At this point you may be asked about a merge message. Just continue with
- the default. If you're not asked anything it's because a fast forward
- rebase was possible.
-
- - Keep working on your personal branches:
-
- # do some work on replaceafill/novalaciro_cms
- $ git commit -m "Did more work"
- $ git push origin replaceafill/novalaciro_cms
-
- - Once you want something deployed to the testing server, push your
- personal branch to the appropriate *_dev branch:
-
- $ git push origin replaceafill/novalaciro_cms:novalaciro_dev
-
- This will trigger the gitlab CI copying the content of the *_dev branch
- to the server.
-
- The URLs in the testing server are:
-
- https://novalaciro.novawebdevelopment.org/
- https://ourrevolutionarlington.novawebdevelopment.org
- https://nea4or.novawebdevelopment.org/
-
- And the expected paths for the themes are:
-
- /themes/novalaciro
- /themes/ora
- /themes/nea4or
-
- so you'll need to make your boxes/images/etc to match. You'll also need
- to set up any content your theme uses. I for example had to add a new
- box for my homepage jumbotron.
-
- Let me know if you need help with this.
-