Skip to content

Commit

Permalink
deps update
Browse files Browse the repository at this point in the history
  • Loading branch information
garrying committed Jan 21, 2024
1 parent a83eb2a commit 035e770
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 39 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.1'
ruby-version: '3.3'
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- name: Build site
run: bundle exec jekyll build
- name: Cache HTMLProofer
id: cache-htmlproofer
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: tmp/.htmlproofer
key: ${{ runner.os }}-htmlproofer
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.1'
ruby-version: '3.3'
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- name: Build site
run: bundle exec jekyll build
Expand All @@ -40,7 +40,7 @@ jobs:
path: ./*
key: ${{ github.sha }}
- name: Rsync Deployment
uses: Burnett01/rsync-deployments@5.2
uses: Burnett01/rsync-deployments@6.0.0
with:
switches: -avzrO --delete --no-p
path: _site/
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ source "https://rubygems.org"
#
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!
gem "jekyll", "~> 4.3.1"
gem "jekyll", "~> 4.3.3"

group :test do
gem "rake"
Expand Down
71 changes: 42 additions & 29 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.1.0)
addressable (2.8.5)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
afm (0.2.2)
async (2.6.4)
async (2.8.0)
console (~> 1.10)
fiber-annotation
io-event (~> 1.1)
timers (~> 4.1)
colorator (1.1.0)
concurrent-ruby (1.1.10)
console (1.23.2)
concurrent-ruby (1.2.3)
console (1.23.3)
fiber-annotation
fiber-local
em-websocket (0.5.3)
Expand All @@ -21,10 +21,11 @@ GEM
ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
ffi (1.15.5)
ffi (1.16.3)
fiber-annotation (0.2.0)
fiber-local (1.0.0)
forwardable-extended (2.6.0)
google-protobuf (3.25.2)
hashery (2.1.2)
html-proofer (5.0.8)
addressable (~> 2.3)
Expand All @@ -36,10 +37,10 @@ GEM
yell (~> 2.0)
zeitwerk (~> 2.5)
http_parser.rb (0.8.0)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
io-event (1.3.2)
jekyll (4.3.1)
io-event (1.4.2)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
Expand All @@ -59,65 +60,77 @@ GEM
jekyll (>= 3.7, < 5.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.7.1)
liquid (4.0.4)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.8.4)
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
nokogiri (1.16.0-arm-linux)
racc (~> 1.4)
nokogiri (1.16.0-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.0-x86_64-linux)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
pdf-reader (2.11.0)
pdf-reader (2.12.0)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
hashery (~> 2.0)
ruby-rc4
ttfunk
public_suffix (5.0.3)
racc (1.7.1)
public_suffix (5.0.4)
racc (1.7.3)
rainbow (3.1.1)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (4.0.0)
rexml (3.2.6)
rouge (4.2.0)
ruby-rc4 (0.1.5)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sass-embedded (1.70.0-arm-linux-gnueabihf)
google-protobuf (~> 3.25)
sass-embedded (1.70.0-arm-linux-musleabihf)
google-protobuf (~> 3.25)
sass-embedded (1.70.0-arm64-darwin)
google-protobuf (~> 3.25)
sass-embedded (1.70.0-x86_64-linux-gnu)
google-protobuf (~> 3.25)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
timers (4.3.5)
ttfunk (1.7.0)
typhoeus (1.4.0)
typhoeus (1.4.1)
ethon (>= 0.9.0)
unicode-display_width (2.3.0)
webrick (1.7.0)
unicode-display_width (2.5.0)
webrick (1.8.1)
yell (2.2.2)
zeitwerk (2.6.11)
zeitwerk (2.6.12)

PLATFORMS
ruby
arm-linux
arm-linux-gnueabihf
arm-linux-musleabihf
arm64-darwin-23
x86_64-linux

DEPENDENCIES
html-proofer
jekyll (~> 4.3.1)
jekyll (~> 4.3.3)
jekyll-feed (~> 0.16)
jekyll-redirect-from
rake
tzinfo-data

BUNDLED WITH
2.3.22
2.5.5
5 changes: 4 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ task :test do
cache: { timeframe: { external: '6M' } },
ignore_status_codes: [429],
swap_urls: { %r{^https://ournetworks.ca} => "" },
ignore_urls: [/ipfs.io\/ipfs/]
ignore_urls: [/ipfs.io\/ipfs/],
typhoeus: {
headers: { "User-Agent" => "Chrome/120.0.0.0 Safari/537.36" },
}
}
HTMLProofer.check_directory('./_site', options).run
end
Expand Down
2 changes: 1 addition & 1 deletion code-of-conduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,6 @@ If you are being harassed, notice that someone else is being harassed, or have a

Those who wish to report a violation but don't feel comfortable talking to the organizers online or at an event can email [[email protected]](mailto:[email protected]), which is **currently** monitored by **Dawn Walker**, and will be monitored during the event on an active basis.

Our [internal guidelines](https://github.com/ournetworks/2019/blob/master/CONDUCT.md#guidelines) for enforcing our Code of Conduct are viewable online.
Our [internal guidelines](https://github.com/ournetworks/2019/blob/master/CONDUCT.md#guidelines){:data-proofer-ignore=""} for enforcing our Code of Conduct are viewable online.

_These are adapted from the [Toronto Mesh Code of Conduct](https://tomesh.net/code-of-conduct/), which in turn was based on the anti-harassment policy from the [Geek Feminism Wiki](https://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy) and draws inspiration from [No more rock stars: how to stop abuse in tech communities](https://hypatia.ca/2016/06/21/no-more-rock-stars/). The section about expected behaviour is adapted from the [Gamma Space Code of Conduct](https://github.com/GammaSpace/policies/blob/master/code-of-conduct.md). We reviewed the Wikipedia [Universal Code of Conduct](https://meta.wikimedia.org/wiki/Universal_Code_of_Conduct) for the section on unacceptable behaviours and enforcement on a wiki._
6 changes: 3 additions & 3 deletions recorded-talks.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ redirect_from:
Full archives of 2020 videos are available:

- IPFS: [ipfs://QmSgVLXPu4ZASkbcebkhXsgx7NjjJx1Xa1ymqkNWaTU4Jt]({{ site.ipfs_gateway }}/ipfs/QmSgVLXPu4ZASkbcebkhXsgx7NjjJx1Xa1ymqkNWaTU4Jt/){: .overflow-wrap}
- Mirror: [Toronto Mesh Alexandria Mirror](https://alexandria.tomesh.net/ournetworks/2020)
- Mirror: [Toronto Mesh Alexandria Mirror](https://alexandria.tomesh.net/ournetworks/2020){:data-proofer-ignore=""}
- Internet Archive: [Our Networks 2020 Talks](https://archive.org/details/ournetworks2020) (torrent available)
- YouTube playlist: [Our Networks 2020 — Growing Our Networks in Uncertain Times↔Places](https://www.youtube.com/playlist?list=PLx7_J32Ys60eSNBStqqEeVN1cbA-dKf9q)

Expand All @@ -39,7 +39,7 @@ Thank you to our A/V volunteers: [Henry Wilkinson](https://github.com/Shrinks99)
Full archives of 2019 videos are available:

- IPFS: [ipfs://QmQQfD1ztg1aG82VmUmutusbxn7tL4c2o1qHv1ivyWbNj6]({{ site.ipfs_gateway }}/ipfs/QmaWc83FvLkyvw8p7Q45prW7HTXAaLgk8jxmkdciokaE1K/){: .overflow-wrap}
- Mirror: [Toronto Mesh Alexandria Mirror](https://alexandria.tomesh.net/ournetworks/2019)
- Mirror: [Toronto Mesh Alexandria Mirror](https://alexandria.tomesh.net/ournetworks/2019){:data-proofer-ignore=""}
- Internet Archive: [Our Networks 2019 Talks](https://archive.org/details/ournetworks2019) (torrent available)
- YouTube playlist: [Our Networks 2019 RE: Infrastructures](https://www.youtube.com/playlist?list=PLx7_J32Ys60cAmBbdDtx1-THpDU4XbtdV)

Expand Down Expand Up @@ -73,7 +73,7 @@ Thank you to our A/V volunteers: [Yurko](https://github.com/YurkoWasHere), [Henr
Full archives of 2018 videos are available:

- IPFS: [ipfs://QmQQfD1ztg1aG82VmUmutusbxn7tL4c2o1qHv1ivyWbNj6]({{ site.ipfs_gateway }}/ipfs/QmQQfD1ztg1aG82VmUmutusbxn7tL4c2o1qHv1ivyWbNj6/){: .overflow-wrap}
- Mirror: [Toronto Mesh Alexandria Mirror](https://alexandria.tomesh.net/ournetworks/2018)
- Mirror: [Toronto Mesh Alexandria Mirror](https://alexandria.tomesh.net/ournetworks/2018){:data-proofer-ignore=""}
- Internet Archive: [Our Networks 2018 Talks](https://archive.org/details/ournetworks2018) (torrent available)
- YouTube playlist: [Our Networks 2018 Beyond DIY: Do It With Others](https://www.youtube.com/playlist?list=PLx7_J32Ys60ey2bgSn2soAoBy0v9bBUbT)

Expand Down

0 comments on commit 035e770

Please sign in to comment.