2021 Reset (#234)

* reset template

* reset

* fix markup

* ruby bump

* fix gemlock

* remove call for event that ended

* updated ci

Co-authored-by: dcwalk <[email protected]>

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.6.3
+  - 2.7.3
 
 before_install:
   # Here, we decrypt a passwordless ssh key for acting as a user on the server named "travis"
@@ -51,8 +51,4 @@ after_deploy:
   - npx @sammacbeth/dat-publisher update --del -s $DATKEY --seedtime 180 $DATADDRESS _site/
 
 notifications:
-  email:
-    recipients:
-      - [email protected]
-    on_success: change
-    on_failure: change
+  email: false

2020.md

@@ -0,0 +1,9 @@
+---
+layout: page
+order: 4
+section: "2020"
+titleDisplay: "2020"
+parent: "Previous years"
+redirect_to:
+  - "https://2020.ournetworks.ca"
+---

404.md

@@ -7,7 +7,7 @@ order: 0
 
 <div class="container">
   <div class="post">
-    <h1 class="heading-2 metaflop">404: Page Not Found</h1>
+    <h1 class="heading-2">404: Page Not Found</h1>
     <p>It looks like nothing was found at this location. <a href="{{ site.baseurl }}/">Return to home page</a>.</p>
   </div>
 </div>

Gemfile

@@ -8,7 +8,7 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 4.1.0"
+gem "jekyll", "~> 4.2.0"
 
 group :test do
   gem "rake"

Gemfile.lock

@@ -4,16 +4,16 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.6)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.1.9)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
+    ethon (0.14.0)
+      ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    ffi (1.13.1)
+    ffi (1.15.1)
     forwardable-extended (2.6.0)
-    html-proofer (3.15.3)
+    html-proofer (3.19.1)
       addressable (~> 2.3)
       mercenary (~> 0.3)
       nokogumbo (~> 2.0)
@@ -22,24 +22,24 @@ GEM
       typhoeus (~> 1.3)
       yell (~> 2.0)
     http_parser.rb (0.6.0)
-    i18n (1.8.3)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jekyll (4.1.0)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
       jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
       mercenary (~> 0.4.0)
       pathutil (~> 0.9)
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
-    jekyll-feed (0.13.0)
+      terminal-table (~> 2.0)
+    jekyll-feed (0.15.1)
       jekyll (>= 3.7, < 5.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
@@ -52,32 +52,32 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.2.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    mini_portile2 (2.5.1)
-    nokogiri (1.11.4)
+    mini_portile2 (2.5.3)
+    nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    nokogumbo (2.0.2)
+    nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
-    parallel (1.19.2)
+    parallel (1.20.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.6)
     racc (1.5.2)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rb-fsevent (0.10.4)
+    rake (13.0.3)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (3.20.0)
+    rouge (3.26.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
-    terminal-table (1.8.0)
+    terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
@@ -89,11 +89,11 @@ PLATFORMS
 
 DEPENDENCIES
   html-proofer
-  jekyll (~> 4.1.0)
+  jekyll (~> 4.2.0)
   jekyll-feed (~> 0.12)
   jekyll-redirect-from
   rake
   tzinfo-data
 
 BUNDLED WITH
-   2.1.4
+   2.2.19

Rakefile

@@ -6,8 +6,9 @@ task :test do
     allow_hash_href: true,
     internal_domains: ['ournetworks.ca'],
     hydra: { max_concurrency: 12 },
-    cache: { timeframe: '1w' },
-    http_status_ignore: [999, 403]
+    cache: { timeframe: '6M' },
+    http_status_ignore: [999, 403],
+    url_ignore: [/ipfs.io\/ipfs/]
   }
   HTMLProofer.check_directory('./_site', options).run
 end

_includes/2020-hero.html

@@ -1,8 +1,7 @@
 <div class="splash-hero pt-m pb-s">
   <div class="container container-full-width">
   <header>
-    <h1 class="heading-1 mb-0 mt-0 metaflop">Growing Our Networks in Uncertain Times↔Places</h1>
-    <h2 class="heading-3">September 8–12, 2020</h2>
+    <h1 class="heading-1 mb-0 mt-0">Our Networks</h1>
     <h2 class="heading-3 mb-0">Online, Distributed</h2>
     <h2 class="heading-3 mt-0">Based out of UTC-4 from America/Toronto</h2>
   </header>