Compare commits

...

26 commits

Author SHA1 Message Date
Jesper Hess bc8fe71807
Think I found the stupid typo! 2020-03-01 20:55:52 +01:00
Jesper Hess 8ffb298dfc
More Gemfile stuff 2020-03-01 20:47:03 +01:00
Jesper Hess cf18c79890
Split gem install command in build 2020-03-01 20:14:47 +01:00
Jesper Hess 7fb2822669
More stuff... 2020-03-01 20:11:04 +01:00
Jesper Hess a7acaa8c61
Update bundler 2020-03-01 20:07:19 +01:00
Jesper Hess 2ffdaddd29
Trying stuff 2020-03-01 19:55:25 +01:00
Jesper Hess 3584a44804
Typo 2020-03-01 19:40:59 +01:00
Jesper Hess 513d77754c
Switch to Jekyll docker image for build 2020-03-01 19:37:43 +01:00
Jesper Hess 0d323649de
More build-related tweaks v2 2020-03-01 15:47:51 +01:00
Jesper Hess e4bf5b56fd
More build-related tweaks 2020-03-01 15:38:55 +01:00
Jesper Hess 9f4369042b
Messing with versions to try to fix build 2020-03-01 15:31:59 +01:00
Jesper Hess 7e7d4fe2c6
Add error trace to build command 2020-03-01 14:53:48 +01:00
Jesper Hess 002c573c59
Downgrade ruby in .drone.yml 2020-03-01 14:29:03 +01:00
Jesper Hess 9606e8979e
Update bundler in Gemfile.lock 2020-03-01 14:17:52 +01:00
Jesper Hess 837065e0cc
Update Gemfile.lock 2020-03-01 14:13:14 +01:00
Jesper Hess 382159d011
Trying to get build to work 2020-03-01 14:08:00 +01:00
Jesper Hess 75174f4297
Triggering drone 2020-03-01 10:52:27 +01:00
Jesper Hess 71eb06d0b4
Triggering drone 2020-03-01 10:48:55 +01:00
Jesper Hess d87384d4ae
Add May 2020 2020-02-23 19:49:25 +01:00
Jesper Hess aee8349be5
Add April 2020 2020-01-26 18:20:12 +01:00
Jesper Hess 169739aaf7
Add .jekyll-cache to .gitignore 2019-12-30 10:29:46 +01:00
Jesper Hess 9b41403a2f
Fix typo in events.yml 2019-12-30 10:14:20 +01:00
Jesper Hess 3432185e78
Specify specific version of bundler in .drone.yml 2019-12-29 21:15:33 +01:00
Jesper Hess cff5d9b0b2
Update Gemfile.lock 2019-12-29 21:10:05 +01:00
Jesper Hess f265ce2982
Add Feb & Mar 2020 dates 2019-12-29 20:57:24 +01:00
valberg 4d5dc635e7 Merge branch 'data.coop-logo' of reynir/website into master 2019-12-17 13:03:43 +00:00
6 changed files with 55 additions and 50 deletions

View file

@ -3,11 +3,12 @@ name: default
steps: steps:
- name: build - name: build
image: ruby image: ruby:2.6.5
commands: commands:
- gem install bundler - gem install bundler
- gem install jekyll
- bundle install - bundle install
- bundle exec jekyll build - bundle exec jekyll build --trace
- name: docker - name: docker
image: plugins/docker image: plugins/docker

1
.gitignore vendored
View file

@ -1,5 +1,6 @@
*.sw* *.sw*
_site _site
.jekyll-metadata .jekyll-metadata
.jekyll-cache
.sass-cache .sass-cache
.bundle/ .bundle/

1
.trigger.txt Normal file
View file

@ -0,0 +1 @@
Triggering drone

View file

@ -9,7 +9,7 @@ ruby RUBY_VERSION
# #
# This will help ensure the proper Jekyll version is running. # This will help ensure the proper Jekyll version is running.
# Happy Jekylling! # Happy Jekylling!
gem "jekyll", ">= 3.8.5" gem "jekyll", "= 4.0.0"
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and # If you want to use GitHub Pages, remove the "gem "jekyll"" above and

View file

@ -1,73 +1,75 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
addressable (2.6.0) addressable (2.7.0)
public_suffix (>= 2.0.2, < 4.0) public_suffix (>= 2.0.2, < 5.0)
colorator (1.1.0) colorator (1.1.0)
concurrent-ruby (1.1.4) concurrent-ruby (1.1.6)
em-websocket (0.5.1) em-websocket (0.5.1)
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0) http_parser.rb (~> 0.6.0)
eventmachine (1.2.7) eventmachine (1.2.7)
ffi (1.10.0) ffi (1.12.2)
forwardable-extended (2.6.0) forwardable-extended (2.6.0)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
i18n (0.9.5) i18n (1.8.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jekyll (3.8.5) jekyll (4.0.0)
addressable (~> 2.4) addressable (~> 2.4)
colorator (~> 1.0) colorator (~> 1.0)
em-websocket (~> 0.5) em-websocket (~> 0.5)
i18n (~> 0.7) i18n (>= 0.9.5, < 2)
jekyll-sass-converter (~> 1.0) jekyll-sass-converter (~> 2.0)
jekyll-watch (~> 2.0) jekyll-watch (~> 2.0)
kramdown (~> 1.14) kramdown (~> 2.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0) liquid (~> 4.0)
mercenary (~> 0.3.3) mercenary (~> 0.3.3)
pathutil (~> 0.9) pathutil (~> 0.9)
rouge (>= 1.7, < 4) rouge (~> 3.0)
safe_yaml (~> 1.0) safe_yaml (~> 1.0)
jekyll-feed (0.11.0) terminal-table (~> 1.8)
jekyll (~> 3.3) jekyll-feed (0.13.0)
jekyll-sass-converter (1.5.2) jekyll (>= 3.7, < 5.0)
sass (~> 3.4) jekyll-sass-converter (2.1.0)
jekyll-sitemap (1.2.0) sassc (> 2.0.1, < 3.0)
jekyll (~> 3.3) jekyll-sitemap (1.4.0)
jekyll-watch (2.1.2) jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0) listen (~> 3.0)
kramdown (1.17.0) kramdown (2.1.0)
liquid (4.0.1) kramdown-parser-gfm (1.1.0)
listen (3.1.5) kramdown (~> 2.0)
rb-fsevent (~> 0.9, >= 0.9.4) liquid (4.0.3)
rb-inotify (~> 0.9, >= 0.9.7) listen (3.2.1)
ruby_dep (~> 1.2) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6) mercenary (0.3.6)
pathutil (0.16.2) pathutil (0.16.2)
forwardable-extended (~> 2.6) forwardable-extended (~> 2.6)
public_suffix (3.0.3) public_suffix (4.0.3)
rb-fsevent (0.10.3) rb-fsevent (0.10.3)
rb-inotify (0.10.0) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
rouge (3.3.0) rouge (3.16.0)
ruby_dep (1.5.0)
safe_yaml (1.0.5) safe_yaml (1.0.5)
sass (3.7.3) sassc (2.2.1)
sass-listen (~> 4.0.0) ffi (~> 1.9)
sass-listen (4.0.0) terminal-table (1.8.0)
rb-fsevent (~> 0.9, >= 0.9.4) unicode-display_width (~> 1.1, >= 1.1.1)
rb-inotify (~> 0.9, >= 0.9.7) unicode-display_width (1.6.1)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
jekyll (>= 3.8.5) jekyll (= 4.0.0)
jekyll-feed (~> 0.6) jekyll-feed (~> 0.6)
jekyll-sitemap jekyll-sitemap
tzinfo-data tzinfo-data
RUBY VERSION RUBY VERSION
ruby 2.6.1p33 ruby 2.6.5p114
BUNDLED WITH BUNDLED WITH
1.17.3 2.0.2

View file

@ -1,18 +1,18 @@
- danish_title: "Søndag d. 24. november 2019" - danish_title: "Søndag d. 29. marts 2020"
danish_text: "Vi sidder i <strong>Mellemrummet</strong>. Kom og drik god fairtradekaffe med os og lær at sikre dit privatliv på det vilde web!" danish_text: "Vi sidder i <strong>Mellemrummet</strong>. Kom og drik god fairtradekaffe med os og lær at sikre dit privatliv på det vilde web!"
english_title: "Sunday November 24th 2019" english_title: "Sunday March 29th 2020"
english_text: "We'll be at <strong>Mellemrummet</strong>, as usual. Come join us, drink a cup of good fair trade coffee and learn how to protect your privacy!" english_text: "We'll be at <strong>Mellemrummet</strong>, as usual. Come join us, drink a cup of good fair trade coffee and learn how to protect your privacy!"
time: "13:00-17:00" time: "13:00-17:00"
current: true current: true
- danish_title: "Søndag d. 29. december 2019" - danish_title: "Søndag d. 26. april 2020"
danish_text: "Vi holder julepause i december. Vi ses den 26. januar 2020!"
english_title: "Sunday December 29th 2019"
english_text: "We're taking a break in December. See you again on January 26th 2020!"
time: ""
current: false
- danish_title: "Søndag d. 26. januar 2020"
danish_text: "Vi sidder i <strong>Mellemrummet</strong>. Kom og drik god fairtradekaffe med os og lær at sikre dit privatliv på det vilde web!" danish_text: "Vi sidder i <strong>Mellemrummet</strong>. Kom og drik god fairtradekaffe med os og lær at sikre dit privatliv på det vilde web!"
english_title: "Sunday January 26th 2020" english_title: "Sunday April 26th 2020"
english_text: "We'll be at <strong>Mellemrummet</strong>, as usual. Come join us, drink a cup of good fair trade coffee and learn how to protect your privacy!" english_text: "We'll be at <strong>Mellemrummet</strong>, as usual. Come join us, drink a cup of good fair trade coffee and learn how to protect your privacy!"
time: "13:00-17:00" time: "13:00-17:00"
current: false current: false
- danish_title: "Søndag d. 31. maj 2020"
danish_text: "Vi sidder i <strong>Mellemrummet</strong>. Kom og drik god fairtradekaffe med os og lær at sikre dit privatliv på det vilde web!"
english_title: "Sunday May 31st 2020"
english_text: "We'll be at <strong>Mellemrummet</strong>, as usual. Come join us, drink a cup of good fair trade coffee and learn how to protect your privacy!"
time: "13:00-17:00"
current: false