Skip to content

Commit

Permalink
Travis #117
Browse files Browse the repository at this point in the history
  • Loading branch information
DeckOfPandas committed Aug 6, 2018
1 parent 5db1454 commit 6dfdd19
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 14 deletions.
19 changes: 8 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The repos described here contain the source code for the Too Much of a Person pr
## Licence
Source code is licensed under GPLv3. Website content is licensed under CC BY. All IP remains with Too Much of a Person.

## Overview of code and builds
## Overview
### Repositories
* RAW repo https://github.com/DeckOfPandas/too-much-of-a-person
* STAGING PARKED repo https://github.com/too-much-of-a-person/com.toomuchofaperson.test
Expand Down Expand Up @@ -36,18 +36,15 @@ Summary:

## Raw source code
RAW repo: https://github.com/DeckOfPandas/too-much-of-a-person branch `source`
* Any PR into branch `source` triggers Travis
* Branch `source` to be maintained as identical to current release by virtue of merging PRs as appropriate (i.e. not those that were raised to test some new feature that isn't for deployment yet)
* Branch `current` to be maintained as identical to current release
* PR into branch `source` triggers Travis

## Deployment to staging site (and automated optimisation and testing)
* Travis picks up Pull Requests to RAW repo branch `source`, runs tests, compresses shiz, builds the site using gulp, then pushes the contents of the resulting built `_site` folder back to branch `master`

## Deployment to live site
* Clone https://github.com/DeckOfPandas/too-much-of-a-person branch `master` locally, build (check build path in config...), then push to `live/master`.
* It is the reponsibility of any dev who updates the live site to ensure that PRs into `raw/source` have been merged appropriately to ensure that the source code for any live build is *exactly as per `raw/source` *
push *their own local build from the souce code exactly as per the open PR* to `live/master`
* Note: the "CI" (well, it isn't yet is it) process here will be improved/finished in whatever way is best for those who will eventually update the website the most, but as it stands deploying live requires someone confident with jekyll ,gulp and git in order to reduce the potential for public-facing errors.
* Comments, complaints etc to @DeckOfPandas please
* Clone https://github.com/DeckOfPandas/too-much-of-a-person branch `master` locally, build (check uild path in config...), then push to LIVE repo (probably not to `master`, though)


# Building locally
### Initial setup for first local build
Expand All @@ -65,13 +62,13 @@ RAW repo: https://github.com/DeckOfPandas/too-much-of-a-person branch `source`
* Make sure `baseurl` and `url` are set up correctly for the main build:
* For staging site, these settings will be something like:
```
baseurl: "/too-much-of-a-person/"
url: "https://deckofpandas.github.io/"
baseurl: "/too-much-of-a-person"
url: "https://deckofpandas.github.io"
```
* Locally, use something like:
```
baseurl: "/"
url: "http://localhost:3000"
url: "http://localhost:3000/"
```
* Live site
```
Expand Down
2 changes: 1 addition & 1 deletion assets/styles/main.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion blog/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html> <html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui"> <title>Too Much of a Person - Scribbles</title> <link rel="stylesheet" type="text/css" href="/too-much-of-a-person/assets/styles/main.css"> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous"> </head> <body> <!--[if lt IE 10]> <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> <![endif]--> <section class="header"> <div class="container-fullwidth topbar"> <a class="home" href="/too-much-of-a-person/" class="logo"> <img id="logo" alt="Too Much of a Person" title="Too Much of a Person" src="/too-much-of-a-person/assets/images/logos/logo_square_75.jpg" class="img-fluid"> </a> <label for="menu-burger" class="menu-burger"><span class="fas fa-bars fa-lg"></span>Menu</label> <input type="checkbox" id="menu-burger" role="button"> <ul id="nav"> <li><a href="/too-much-of-a-person/#index_about">About</a></li> <li><a href="/too-much-of-a-person/#index_interviews">Stories</a></li> <li><a href="/too-much-of-a-person/#index_scribbles">Scribbles</a></li> <li><a href="/too-much-of-a-person/#index_events">Events</a></li> <li><a href="/too-much-of-a-person/#index_team">Team</a></li> <li><a href="/too-much-of-a-person/#index_press-sponsors">Press / Sponsors</a></li> <li><a href="/too-much-of-a-person/#index_contact">Contact</a></li> </ul> <script> document.getElementById("nav").addEventListener("click", menuclick); function menuclick() { document.getElementById("menu-burger").checked = false; } </script> </div> </section> <div class="container"> <section class="container-fullwidth blog_archive_page"> <div class="container-fullwidth blog_header_img"> <img class="img-fluid" src="/too-much-of-a-person/assets/images/backgrounds/blog_archive_letterbox.jpg" /> </div> <div class="blog_archive_title"> <h1>Scribbles</h1> <span class="author">Updated every Thursday</span> </div> <div> <ul class="blog_archive_list"> <li> <span class="blog_list_title"><a href="https://deckofpandas.github.io//too-much-of-a-person/blog/2018/08/say-her-name/" class="blog_list_title">Say. Her. Name</a></span> <br /><time datetime="2018-08-02T00:00:00+00:00">02 August 2018</time><span class="author">Sunaina Dasgupta</span> <p>Nia Wilson. Say her name. On the night of 22nd July 2018, Nia Wilson was stabbed by a white man and bled to death while exiting BART station in Oakland, California. Protests erupted over concerns that the police would neglect...</p> </li> <li> <span class="blog_list_title"><a href="https://deckofpandas.github.io//too-much-of-a-person/blog/2018/07/what-its-really-like-to-have-a-story-and-photo-session-for-tmoap/" class="blog_list_title">What it's REALLY like to have a story and photo session for the Too Much of a Person project</a></span> <br /><time datetime="2018-07-26T00:00:00+00:00">26 July 2018</time><span class="author">Sunaina Dasgupta</span> <p>After reading a social media post of D’s about this project in November 2017 - I knew that I had to take part, at least as a participant. I told family, friends and strangers about the project and encouraged them...</p> </li> <li> <span class="blog_list_title"><a href="https://deckofpandas.github.io//too-much-of-a-person/blog/2018/07/hannah-gadsby-is-too-much-of-a-person/" class="blog_list_title">Hannah Gadsby is Too Much of a Person</a></span> <br /><time datetime="2018-07-19T00:00:00+00:00">19 July 2018</time><span class="author">Sunaina Dasgupta</span> <p>Exactly a month ago today, Netflix released Nanette by Hannah Gadsby - one of best stand up specials I’ve ever seen. I’ve been captivated by how blisteringly insightful it is. If you haven’t watched Nanette yet, please stop reading...</p> </li> <li> <span class="blog_list_title"><a href="https://deckofpandas.github.io//too-much-of-a-person/blog/2018/07/what-is-choosing-yourself/" class="blog_list_title">What is 'Choosing Yourself'?</a></span> <br /><time datetime="2018-07-12T00:00:00+00:00">12 July 2018</time><span class="author">Ellen Nguyen</span> <p>To choose yourself means living life at your own pace. When someone tells you, you’re too young, too old, or you two are at different stages of life, don’t disagree with them. Don’t defend yourself. Let them have their judgment....</p> </li> <li> <span class="blog_list_title"><a href="https://deckofpandas.github.io//too-much-of-a-person/blog/2018/07/get-them-tits-out/" class="blog_list_title">Get. Them. Tits. Out.</a></span> <br /><time datetime="2018-07-05T00:00:00+00:00">05 July 2018</time><span class="author">Sunaina Dasgupta</span> <p>During one of our recent Too Much of a person (TMOAP) planning meetings, we veered a little off course and started discussing experiences of being ‘catcalled’. I reminisced about the time I was stopped on the street and told my...</p> </li> <li> <span class="blog_list_title"><a href="https://deckofpandas.github.io//too-much-of-a-person/blog/2018/06/that-one-time-anne-robinson-said-i-was-too-feeble/" class="blog_list_title">That one time Anne Robinson said I was "too feeble"</a></span> <br /><time datetime="2018-06-28T00:00:00+00:00">28 June 2018</time><span class="author">Sunaina Dasgupta</span> <p>On a brisk March morning in London, the ‘Too Much of a Person’ contingent set out to join #March4Women 2018 which was calling for an end to gender-based discrimination and violence in workplaces all around the world​. As the march...</p> </li> </ul> <div class="center" style="margin-top: -50px; margin-bottom: 20px;"> <i class="fas fa-ellipsis-h fa-lg" style="color:#888;vertical-align:middle;"></i> </div> </div> </section> </div> <section class="footer container-fullwidth cta_mailinglist"> <div class="container" style="padding-bottom:50px"> <h3>Sign up to our mailing list to stay in touch:</h3> <form class="form" action="http://eepurl.com/dzq3ND" method="post" target="popupwindow" onsubmit="window.open('#', 'popupwindow', 'scrollbars=yes,width=800,height=600');return true"> <input type="hidden" value="1" name="embed"/> <input type="email" name="email" size="30" placeholder="Your email address"/><br> <button type="submit" class="btn btn-success" name="subscribe" style="margin-top:20px;">Subscribe<i class="fas fa-angle-right"></i></button> </form> </div> </section> <section class="footer container-fullwidth" > <div class="container social_blobs light_icons" style="margin-top:0;padding-bottom:80px;"> <div class="container flex-container"> <a class="blob col-md-3 col-sm-6" href="mailto:[email protected]" target="new"><i class="fas fa-envelope"></i></a> <a class="blob col-md-3 col-sm-6" href="https://instagram.com/toomuchofaperson/" target="new"><i class="fab fa-instagram"></i></a> </div> <div class="container flex-container"> <a class="blob col-md-3 col-sm-6" href="https://twitter.com/tmoaptweets/" target="new"><i class="fab fa-twitter"></i></a> <a class="blob col-md-3 col-sm-6" href="https://www.facebook.com/toomuchofaperson/" target="new"><i class="fab fa-facebook"></i></a> <!--<a href="http://github.com/DeckOfPandas/too-much-of-a-person/" target="new"><i class="fab fa-github"></i></a>--> </div> </div> </section> <section class="container-fullwidth copyright"> &copy; 2018 <a href="https://github.com/DeckOfPandas/too-much-of-a-person">Source code</a> published under <a href="https://www.gnu.org/licenses/gpl-3.0.txt">GPLv3</a>. <br> Hosted by <a href="https://github.com/">GitHub Pages.</a> </section> </body> <script type="text/javascript" src="/too-much-of-a-person/assets/scripts/main.js"></script> </html>
<!doctype html> <html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui"> <title>Too Much of a Person - Scribbles</title> <link rel="stylesheet" type="text/css" href="/too-much-of-a-person/assets/styles/main.css"> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous"> </head> <body> <!--[if lt IE 10]> <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> <![endif]--> <section class="header"> <div class="container-fullwidth topbar"> <a class="home" href="/too-much-of-a-person/" class="logo"> <img id="logo" alt="Too Much of a Person" title="Too Much of a Person" src="/too-much-of-a-person/assets/images/logos/logo_square_75.jpg" class="img-fluid"> </a> <label for="menu-burger" class="menu-burger"><span class="fas fa-bars fa-lg"></span>Menu</label> <input type="checkbox" id="menu-burger" role="button"> <ul id="nav"> <li><a href="/too-much-of-a-person/#index_about">About</a></li> <li><a href="/too-much-of-a-person/#index_interviews">Stories</a></li> <li><a href="/too-much-of-a-person/#index_scribbles">Scribbles</a></li> <li><a href="/too-much-of-a-person/#index_events">Events</a></li> <li><a href="/too-much-of-a-person/#index_team">Team</a></li> <li><a href="/too-much-of-a-person/#index_press-sponsors">Press / Sponsors</a></li> <li><a href="/too-much-of-a-person/#index_contact">Contact</a></li> </ul> <script> document.getElementById("nav").addEventListener("click", menuclick); function menuclick() { document.getElementById("menu-burger").checked = false; } </script> </div> </section> <div class="container"> <section class="container-fullwidth blog_archive_page"> <div class="container-fullwidth blog_header_img"> <img class="img-fluid" src="/too-much-of-a-person/assets/images/backgrounds/blog_archive_letterbox.jpg" /> </div> <div class="blog_archive_title"> <h1>Scribbles</h1> <span class="author">Updated every Thursday</span> </div> <div> <ul class="blog_archive_list"> <p class="right" style="margin-top:0;margin-bottom: 0;"> <br /> </p> <li class="blog_list_top"> <span class="blog_list_title"><a href="https://deckofpandas.github.io//too-much-of-a-person/blog/2018/08/say-her-name/" class="blog_list_title">Say. Her. Name</a></span> <br /><time datetime="2018-08-02T00:00:00+00:00">02 August 2018</time><span class="author">Sunaina Dasgupta</span> <p>Nia Wilson. Say her name. On the night of 22nd July 2018, Nia Wilson was stabbed by a white man and bled to death while exiting BART station in Oakland, California. Protests erupted over concerns that the police would neglect...</p> </li> <li> <span class="blog_list_title"><a href="https://deckofpandas.github.io//too-much-of-a-person/blog/2018/07/what-its-really-like-to-have-a-story-and-photo-session-for-tmoap/" class="blog_list_title">What it's REALLY like to have a story and photo session for the Too Much of a Person project</a></span> <br /><time datetime="2018-07-26T00:00:00+00:00">26 July 2018</time><span class="author">Sunaina Dasgupta</span> <p>After reading a social media post of D’s about this project in November 2017 - I knew that I had to take part, at least as a participant. I told family, friends and strangers about the project and encouraged them...</p> </li> <li> <span class="blog_list_title"><a href="https://deckofpandas.github.io//too-much-of-a-person/blog/2018/07/hannah-gadsby-is-too-much-of-a-person/" class="blog_list_title">Hannah Gadsby is Too Much of a Person</a></span> <br /><time datetime="2018-07-19T00:00:00+00:00">19 July 2018</time><span class="author">Sunaina Dasgupta</span> <p>Exactly a month ago today, Netflix released Nanette by Hannah Gadsby - one of best stand up specials I’ve ever seen. I’ve been captivated by how blisteringly insightful it is. If you haven’t watched Nanette yet, please stop reading...</p> </li> <li> <span class="blog_list_title"><a href="https://deckofpandas.github.io//too-much-of-a-person/blog/2018/07/what-is-choosing-yourself/" class="blog_list_title">What is 'Choosing Yourself'?</a></span> <br /><time datetime="2018-07-12T00:00:00+00:00">12 July 2018</time><span class="author">Ellen Nguyen</span> <p>To choose yourself means living life at your own pace. When someone tells you, you’re too young, too old, or you two are at different stages of life, don’t disagree with them. Don’t defend yourself. Let them have their judgment....</p> </li> <li> <span class="blog_list_title"><a href="https://deckofpandas.github.io//too-much-of-a-person/blog/2018/07/get-them-tits-out/" class="blog_list_title">Get. Them. Tits. Out.</a></span> <br /><time datetime="2018-07-05T00:00:00+00:00">05 July 2018</time><span class="author">Sunaina Dasgupta</span> <p>During one of our recent Too Much of a person (TMOAP) planning meetings, we veered a little off course and started discussing experiences of being ‘catcalled’. I reminisced about the time I was stopped on the street and told my...</p> </li> <li> <span class="blog_list_title"><a href="https://deckofpandas.github.io//too-much-of-a-person/blog/2018/06/that-one-time-anne-robinson-said-i-was-too-feeble/" class="blog_list_title">That one time Anne Robinson said I was "too feeble"</a></span> <br /><time datetime="2018-06-28T00:00:00+00:00">28 June 2018</time><span class="author">Sunaina Dasgupta</span> <p>On a brisk March morning in London, the ‘Too Much of a Person’ contingent set out to join #March4Women 2018 which was calling for an end to gender-based discrimination and violence in workplaces all around the world​. As the march...</p> </li> </ul> <div class="center" style="margin-top: -50px; margin-bottom: 20px;"> <i class="fas fa-ellipsis-h fa-lg" style="color:#888;vertical-align:middle;"></i> </div> </div> </section> </div> <section class="footer container-fullwidth cta_mailinglist"> <div class="container" style="padding-bottom:50px"> <h3>Sign up to our mailing list to stay in touch:</h3> <form class="form" action="http://eepurl.com/dzq3ND" method="post" target="popupwindow" onsubmit="window.open('#', 'popupwindow', 'scrollbars=yes,width=800,height=600');return true"> <input type="hidden" value="1" name="embed"/> <input type="email" name="email" size="30" placeholder="Your email address"/><br> <button type="submit" class="btn btn-success" name="subscribe" style="margin-top:20px;">Subscribe<i class="fas fa-angle-right"></i></button> </form> </div> </section> <section class="footer container-fullwidth" > <div class="container social_blobs light_icons" style="margin-top:0;padding-bottom:80px;"> <div class="container flex-container"> <a class="blob col-md-3 col-sm-6" href="mailto:[email protected]" target="new"><i class="fas fa-envelope"></i></a> <a class="blob col-md-3 col-sm-6" href="https://instagram.com/toomuchofaperson/" target="new"><i class="fab fa-instagram"></i></a> </div> <div class="container flex-container"> <a class="blob col-md-3 col-sm-6" href="https://twitter.com/tmoaptweets/" target="new"><i class="fab fa-twitter"></i></a> <a class="blob col-md-3 col-sm-6" href="https://www.facebook.com/toomuchofaperson/" target="new"><i class="fab fa-facebook"></i></a> <!--<a href="http://github.com/DeckOfPandas/too-much-of-a-person/" target="new"><i class="fab fa-github"></i></a>--> </div> </div> </section> <section class="container-fullwidth copyright"> &copy; 2018 <a href="https://github.com/DeckOfPandas/too-much-of-a-person">Source code</a> published under <a href="https://www.gnu.org/licenses/gpl-3.0.txt">GPLv3</a>. <br> Hosted by <a href="https://github.com/">GitHub Pages.</a> </section> </body> <script type="text/javascript" src="/too-much-of-a-person/assets/scripts/main.js"></script> </html>
Loading

0 comments on commit 6dfdd19

Please sign in to comment.