From 93e1c60b3692907013b2b3311d44191582d47483 Mon Sep 17 00:00:00 2001 From: Matt Stratton Date: Thu, 8 Dec 2016 09:45:52 -0600 Subject: [PATCH 1/3] Add sample pony cities Fixes #41 Signed-off-by: Matt Stratton --- .../content/events/2017-hoofington/program.md | 7 + .../2017-hoofington/program/adam-jacob.md | 15 ++ .../2017-hoofington/program/matt-stratton.md | 12 ++ .../content/events/2017-hoofington/welcome.md | 9 + .../content/events/2017-ponyville/program.md | 7 + .../2017-ponyville/program/adam-jacob.md | 15 ++ .../2017-ponyville/program/matt-stratton.md | 12 ++ .../content/events/2017-ponyville/welcome.md | 9 + exampleSite/data/events/2017-hoofington.yml | 191 ++++++++++++++++++ exampleSite/data/events/2017-ponyville.yml | 191 ++++++++++++++++++ 10 files changed, 468 insertions(+) create mode 100644 exampleSite/content/events/2017-hoofington/program.md create mode 100644 exampleSite/content/events/2017-hoofington/program/adam-jacob.md create mode 100644 exampleSite/content/events/2017-hoofington/program/matt-stratton.md create mode 100644 exampleSite/content/events/2017-hoofington/welcome.md create mode 100644 exampleSite/content/events/2017-ponyville/program.md create mode 100644 exampleSite/content/events/2017-ponyville/program/adam-jacob.md create mode 100644 exampleSite/content/events/2017-ponyville/program/matt-stratton.md create mode 100644 exampleSite/content/events/2017-ponyville/welcome.md create mode 100644 exampleSite/data/events/2017-hoofington.yml create mode 100644 exampleSite/data/events/2017-ponyville.yml diff --git a/exampleSite/content/events/2017-hoofington/program.md b/exampleSite/content/events/2017-hoofington/program.md new file mode 100644 index 000000000..a16b0634f --- /dev/null +++ b/exampleSite/content/events/2017-hoofington/program.md @@ -0,0 +1,7 @@ ++++ +City = "Hoofington" +Year = "2017" +date = "2016-07-15T22:06:24-06:00" +title = "Hoofington 2017 Program" +type = "program" ++++ diff --git a/exampleSite/content/events/2017-hoofington/program/adam-jacob.md b/exampleSite/content/events/2017-hoofington/program/adam-jacob.md new file mode 100644 index 000000000..e6344dcf6 --- /dev/null +++ b/exampleSite/content/events/2017-hoofington/program/adam-jacob.md @@ -0,0 +1,15 @@ ++++ +City = "Ponyville" +Year = "2017" +date = "2016-07-15T22:06:24-06:00" +title = "The Evolution of Automation" +type = "talk" +aliases = ["/events/2017-ponyville/program/adamjacob/"] +youtube = "emGKB8TABvI" +vimeo = "" +speakerdeck = "https://speakerdeck.com/mattstratton/shifting-left-securely" +slideshare = "http://www.slideshare.net/mattstratton/the-five-love-languages-of-devops-54549536" +slides = "" ++++ + +We’ll talk about the fundamentals of automation, what we’ve learned over multiple generations of tooling and research, and discuss the path forward. diff --git a/exampleSite/content/events/2017-hoofington/program/matt-stratton.md b/exampleSite/content/events/2017-hoofington/program/matt-stratton.md new file mode 100644 index 000000000..6b4e59fe6 --- /dev/null +++ b/exampleSite/content/events/2017-hoofington/program/matt-stratton.md @@ -0,0 +1,12 @@ ++++ +City = "" +Description = "" +Year = "" +aliases = ["/events/2016-chicago/program/mattstratton/"] +date = "2016-11-11T09:48:20-06:00" +images = ["https://www.arresteddevops.com/img/social/fb/friendly.png"] +title = "matt stratton" +type = "talk" +youtube = "" + ++++ diff --git a/exampleSite/content/events/2017-hoofington/welcome.md b/exampleSite/content/events/2017-hoofington/welcome.md new file mode 100644 index 000000000..f547d79d1 --- /dev/null +++ b/exampleSite/content/events/2017-hoofington/welcome.md @@ -0,0 +1,9 @@ ++++ +Description = "" +title = "" +speaker = "" +images = [""] +aliases = ["/events/2017-hoofington/"] +type = "event" ++++ +Pivot paradigm sticky note agile grok unicorn waterfall is so 2000 and late responsive affordances thought leader. Grok big data ship it unicorn long shadow long shadow hacker. Entrepreneur waterfall is so 2000 and late integrate user centered design innovate integrate parallax prototype pivot user story fund latte iterate driven. Human-centered design SpaceTeam pitch deck workflow responsive venture capital earned media ideate user centered design thinker-maker-doer viral. Engaging co-working paradigm prototype latte prototype parallax sticky note ship it. diff --git a/exampleSite/content/events/2017-ponyville/program.md b/exampleSite/content/events/2017-ponyville/program.md new file mode 100644 index 000000000..6573a40d9 --- /dev/null +++ b/exampleSite/content/events/2017-ponyville/program.md @@ -0,0 +1,7 @@ ++++ +City = "Ponyville" +Year = "2017" +date = "2016-07-15T22:06:24-06:00" +title = "Ponyville 2017 Program" +type = "program" ++++ diff --git a/exampleSite/content/events/2017-ponyville/program/adam-jacob.md b/exampleSite/content/events/2017-ponyville/program/adam-jacob.md new file mode 100644 index 000000000..e6344dcf6 --- /dev/null +++ b/exampleSite/content/events/2017-ponyville/program/adam-jacob.md @@ -0,0 +1,15 @@ ++++ +City = "Ponyville" +Year = "2017" +date = "2016-07-15T22:06:24-06:00" +title = "The Evolution of Automation" +type = "talk" +aliases = ["/events/2017-ponyville/program/adamjacob/"] +youtube = "emGKB8TABvI" +vimeo = "" +speakerdeck = "https://speakerdeck.com/mattstratton/shifting-left-securely" +slideshare = "http://www.slideshare.net/mattstratton/the-five-love-languages-of-devops-54549536" +slides = "" ++++ + +We’ll talk about the fundamentals of automation, what we’ve learned over multiple generations of tooling and research, and discuss the path forward. diff --git a/exampleSite/content/events/2017-ponyville/program/matt-stratton.md b/exampleSite/content/events/2017-ponyville/program/matt-stratton.md new file mode 100644 index 000000000..6b4e59fe6 --- /dev/null +++ b/exampleSite/content/events/2017-ponyville/program/matt-stratton.md @@ -0,0 +1,12 @@ ++++ +City = "" +Description = "" +Year = "" +aliases = ["/events/2016-chicago/program/mattstratton/"] +date = "2016-11-11T09:48:20-06:00" +images = ["https://www.arresteddevops.com/img/social/fb/friendly.png"] +title = "matt stratton" +type = "talk" +youtube = "" + ++++ diff --git a/exampleSite/content/events/2017-ponyville/welcome.md b/exampleSite/content/events/2017-ponyville/welcome.md new file mode 100644 index 000000000..ed6ec776a --- /dev/null +++ b/exampleSite/content/events/2017-ponyville/welcome.md @@ -0,0 +1,9 @@ ++++ +Description = "" +title = "" +speaker = "" +images = [""] +aliases = ["/events/2017-ponyville/"] +type = "event" ++++ +Pivot paradigm sticky note agile grok unicorn waterfall is so 2000 and late responsive affordances thought leader. Grok big data ship it unicorn long shadow long shadow hacker. Entrepreneur waterfall is so 2000 and late integrate user centered design innovate integrate parallax prototype pivot user story fund latte iterate driven. Human-centered design SpaceTeam pitch deck workflow responsive venture capital earned media ideate user centered design thinker-maker-doer viral. Engaging co-working paradigm prototype latte prototype parallax sticky note ship it. diff --git a/exampleSite/data/events/2017-hoofington.yml b/exampleSite/data/events/2017-hoofington.yml new file mode 100644 index 000000000..aff9365ee --- /dev/null +++ b/exampleSite/data/events/2017-hoofington.yml @@ -0,0 +1,191 @@ +name: 2017-hoofington +year: "2017" +city: "Hoofington" +friendly: "2017-hoofington" +status: "past" +startdate: 2017-01-29 +enddate: 2017-01-30 +cfp_date_start: 2016-12-01 +cfp_date_end: 2016-12-30 +cfp_date_announce: 2017-01-01 +coordinates: "41.882219, -87.640530" +location: "Hoofington Palace" +newnav: "yes" +# navigationelements: ["welcome", "contact", "location", "program", "propose", "proposals", "conduct", "sponsor"] +nav_elements: + - name: welcome + # - name: propose + # url: http://cfp.devopsdayschi.org + - name: program + - name: speakers + # - name: registration + - name: sponsor + - name: volunteer + - name: location + - name: contact + - name: conduct + +team_members: + - name: "Jerry Cattell" + twitter: "jcattell" + - name: "Brian Devlin" + twitter: "nilved" + - name: "Joshua Goldman" + - name: "Cora Hays-Magan" + - name: "Michael Lanyon" + twitter: "lanyonm" + - name: "Aaron Lindstrom" + - name: "Chris Read" + twitter: "cread" + - name: "Kevin Reedy" + - name: "Sasha Rosenbaum" + - name: "Matt Stratton" + twitter: "mattstratton" +organizer_email: "organizers@devopsdayschi.org" +proposal_email: "cfp@devopsdayschi.org" +ga_tracking_id: "UA-74738648-1" + +sponsors_accepted: "yes" +sponsors: + - id: pivotal + level: gold + - id: sumologic + level: gold + - id: elastic + level: gold + - id: victorops + level: gold + - id: ahead + level: gold + - id: threatstack + level: gold + - id: chef + level: gold + - id: thoughtworks-products-before-20160908 + level: gold + - id: github + level: gold + - id: 10thmagnitude + level: gold + - id: ca_tech + level: gold + - id: deis + level: gold + - id: xebialabs + level: gold + - id: 2016-carsdotcom + level: gold + - id: overops + level: gold + - id: opsgenie + level: gold + - id: panopta + level: gold + - id: evident + level: gold + - id: pagerduty + level: gold + - id: 2016-newrelic + level: gold + - id: signalsciences + level: gold + - id: appdynamics + level: gold + - id: slalom + level: gold + - id: cloudbees-before-20161025 + level: gold + - id: servercentral + level: silver + - id: morpheus_data + level: silver + - id: 2016-ns1 + level: silver + - id: columntech + level: silver + - id: puppet + level: silver + - id: concurrency + level: silver + - id: herzum + level: silver + - id: atlassian + level: silver + - id: drw + level: bronze + - id: cons3rt + level: bronze + - id: arresteddevops + level: community + - id: softwaredefinedtalk + level: community + - id: devopsconferences + level: community + - id: blacksintechnology + level: community + - id: writespeakcode + level: community + - id: techwhileblack + level: community + - id: cwdevs + level: community + - id: grubhub + level: lunch + - id: appdynamics + level: lanyard + +sponsor_levels: + - id: gold + label: Gold + - id: silver + label: Silver + - id: bronze + label: Bronze + - id: community + label: Community + - id: lunch + label: Lunch + - id: lanyard + label: Lanyard + +speakers: + - id: "abejide-ayodele" + level: talk + - id: "adam-jacob" + level: talk + - id: "alison-stanton" + level: talk + - id: "allie-richards" + level: talk + - id: "angela-dugan" + level: talk + - id: "brian-henerey" + level: talk + - id: "heidi-waterhouse" + level: talk + - id: "jamesha-fisher" + level: talk + - id: "jeff-smith" + level: talk + - id: "jeremy-edberg" + level: talk + - id: "jill-jubinski" + level: talk + - id: "joel-vasallo" + level: talk + - id: "joshua-zimmerman" + level: talk + - id: "ken-mugrage" + level: talk + - id: "michael-stahnke" + level: talk + - id: "morgan-rhodes" + level: talk + - id: "nell-shamrell-harrington" + level: talk + - id: "rebecca-miller-webster" + level: talk + +speaker_levels: + - id: talk + label: Talk diff --git a/exampleSite/data/events/2017-ponyville.yml b/exampleSite/data/events/2017-ponyville.yml new file mode 100644 index 000000000..cbb00d08c --- /dev/null +++ b/exampleSite/data/events/2017-ponyville.yml @@ -0,0 +1,191 @@ +name: 2017-ponyville +year: "2017" +city: "Ponyville" +friendly: "2017-ponyville" +status: "current" +startdate: 2017-01-29 +enddate: 2017-01-30 +cfp_date_start: 2016-12-01 +cfp_date_end: 2016-12-30 +cfp_date_announce: 2017-01-01 +coordinates: "41.882219, -87.640530" +location: "Applejack House" +newnav: "yes" +# navigationelements: ["welcome", "contact", "location", "program", "propose", "proposals", "conduct", "sponsor"] +nav_elements: + - name: welcome + # - name: propose + # url: http://cfp.devopsdayschi.org + - name: program + - name: speakers + # - name: registration + - name: sponsor + - name: volunteer + - name: location + - name: contact + - name: conduct + +team_members: + - name: "Jerry Cattell" + twitter: "jcattell" + - name: "Brian Devlin" + twitter: "nilved" + - name: "Joshua Goldman" + - name: "Cora Hays-Magan" + - name: "Michael Lanyon" + twitter: "lanyonm" + - name: "Aaron Lindstrom" + - name: "Chris Read" + twitter: "cread" + - name: "Kevin Reedy" + - name: "Sasha Rosenbaum" + - name: "Matt Stratton" + twitter: "mattstratton" +organizer_email: "organizers@devopsdayschi.org" +proposal_email: "cfp@devopsdayschi.org" +ga_tracking_id: "UA-74738648-1" + +sponsors_accepted: "yes" +sponsors: + - id: pivotal + level: gold + - id: sumologic + level: gold + - id: elastic + level: gold + - id: victorops + level: gold + - id: ahead + level: gold + - id: threatstack + level: gold + - id: chef + level: gold + - id: thoughtworks-products-before-20160908 + level: gold + - id: github + level: gold + - id: 10thmagnitude + level: gold + - id: ca_tech + level: gold + - id: deis + level: gold + - id: xebialabs + level: gold + - id: 2016-carsdotcom + level: gold + - id: overops + level: gold + - id: opsgenie + level: gold + - id: panopta + level: gold + - id: evident + level: gold + - id: pagerduty + level: gold + - id: 2016-newrelic + level: gold + - id: signalsciences + level: gold + - id: appdynamics + level: gold + - id: slalom + level: gold + - id: cloudbees-before-20161025 + level: gold + - id: servercentral + level: silver + - id: morpheus_data + level: silver + - id: 2016-ns1 + level: silver + - id: columntech + level: silver + - id: puppet + level: silver + - id: concurrency + level: silver + - id: herzum + level: silver + - id: atlassian + level: silver + - id: drw + level: bronze + - id: cons3rt + level: bronze + - id: arresteddevops + level: community + - id: softwaredefinedtalk + level: community + - id: devopsconferences + level: community + - id: blacksintechnology + level: community + - id: writespeakcode + level: community + - id: techwhileblack + level: community + - id: cwdevs + level: community + - id: grubhub + level: lunch + - id: appdynamics + level: lanyard + +sponsor_levels: + - id: gold + label: Gold + - id: silver + label: Silver + - id: bronze + label: Bronze + - id: community + label: Community + - id: lunch + label: Lunch + - id: lanyard + label: Lanyard + +speakers: + - id: "abejide-ayodele" + level: talk + - id: "adam-jacob" + level: talk + - id: "alison-stanton" + level: talk + - id: "allie-richards" + level: talk + - id: "angela-dugan" + level: talk + - id: "brian-henerey" + level: talk + - id: "heidi-waterhouse" + level: talk + - id: "jamesha-fisher" + level: talk + - id: "jeff-smith" + level: talk + - id: "jeremy-edberg" + level: talk + - id: "jill-jubinski" + level: talk + - id: "joel-vasallo" + level: talk + - id: "joshua-zimmerman" + level: talk + - id: "ken-mugrage" + level: talk + - id: "michael-stahnke" + level: talk + - id: "morgan-rhodes" + level: talk + - id: "nell-shamrell-harrington" + level: talk + - id: "rebecca-miller-webster" + level: talk + +speaker_levels: + - id: talk + label: Talk From 64b850ba08dd73d91ebd315e1cce21e74fae0834 Mon Sep 17 00:00:00 2001 From: Matt Stratton Date: Thu, 8 Dec 2016 09:47:38 -0600 Subject: [PATCH 2/3] Update README Signed-off-by: Matt Stratton --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b10af7ae0..97a1e7494 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,6 @@ Once the Travis build has succeeded, update the changelog: # dev examples This is just a list of some scaffold/POC urls since they aren't easy to get to via nav: - [Home Page](http://devopsdays-theme.netlify.com/) -- [Event Page](http://devopsdays-theme.netlify.com/events/2016-chicago/welcome/) -- [Talk Page](http://devopsdays-theme.netlify.com/events/2016-chicago/program/adam-jacob/) -- [Program Page](http://devopsdays-theme.netlify.com/events/2016-chicago/program/) +- [Event Page](http://devopsdays-theme.netlify.com/events/2017-ponyville/welcome/) +- [Talk Page](http://devopsdays-theme.netlify.com/events/2017-ponyville/program/adam-jacob/) +- [Program Page](http://devopsdays-theme.netlify.com/events/2017-ponyville/program/) From a2cfacc10bf4ed7b2ae119ec59b234f5b7190ea8 Mon Sep 17 00:00:00 2001 From: Matt Stratton Date: Thu, 8 Dec 2016 09:51:05 -0600 Subject: [PATCH 3/3] Fix some unneeded stuff that was breaking netlify Signed-off-by: Matt Stratton --- .travis.yml | 12 ------------ Gemfile | 4 ---- Rakefile | 14 -------------- 3 files changed, 30 deletions(-) delete mode 100644 Gemfile delete mode 100644 Rakefile diff --git a/.travis.yml b/.travis.yml index 1827cd0ea..8aff0c4af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,15 +34,3 @@ deploy: on: repo: devopsdays/devopsdays-theme tags: true - -after_deploy: - - cd $TRAVIS_BUILD_DIR - - git checkout master - - git config --global user.email "travis@travis-ci.org" - - git config --global user.name "Travis" - - github_changelog_generator - - #add, commit and push new Changelog - - git add -f CHANGELOG.md - - git commit -m "Travis build $TRAVIS_BUILD_NUMBER pushed updated CHANGELOG" - - git push -fq origin master > /dev/null diff --git a/Gemfile b/Gemfile deleted file mode 100644 index f29228ba9..000000000 --- a/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source "https://rubygems.org" - -gem "rake" -gem "github_changelog_generator" diff --git a/Rakefile b/Rakefile deleted file mode 100644 index f6d1da544..000000000 --- a/Rakefile +++ /dev/null @@ -1,14 +0,0 @@ -require 'github_changelog_generator/task' - - -task :after_deploy do - cd $HOME - git config --global user.email "travis@travis-ci.org" - git config --global user.name "Travis" - github_changelog_generator - - #add, commit and push new Changelog - git add -f . - git commit -m "Travis build $TRAVIS_BUILD_NUMBER pushed updated CHANGELOG" - git push -fq origin gh-pages > /dev/null -end