diff --git a/.github/workflows/build+deploy.yml b/.github/workflows/build+deploy.yml new file mode 100644 index 0000000..cfc9ea2 --- /dev/null +++ b/.github/workflows/build+deploy.yml @@ -0,0 +1,56 @@ +name: Build and Deploy Jekyll Site with Docker + +on: + push: + branches: + - '*' # Build on every branch + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Check out the code + uses: actions/checkout@v4 + + - name: Set UID and GID + run: | + echo "UID=$(id -u)" >> $GITHUB_ENV + echo "GID=$(id -g)" >> $GITHUB_ENV + + - name: Build website with Jekyll (Docker) + env: + UID: ${{ env.UID }} + GID: ${{ env.GID }} + run: | + docker compose run --rm \ + -v $(pwd):/srv/jekyll \ + jekyll \ + jekyll build + + - name: Upload _site directory as artifact + uses: actions/upload-artifact@v4 + with: + name: jekyll-site + path: ./_site + + deploy: + if: github.ref == 'refs/heads/master' # Only run deployment on master branch + needs: build + runs-on: ubuntu-latest + + steps: + - name: Check out the code + uses: actions/checkout@v4 + + - name: Download artifact + uses: actions/download-artifact@v4 + with: + name: jekyll-site + + - name: Deploy to GitHub Pages + uses: peaceiris/actions-gh-pages@v4 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./_site diff --git a/.gitignore b/.gitignore index c322f7e..5e37ffd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ _site .jekyll-metadata .bundle .sass-cache -Gemfile.lock *.iml _rebuild-page* _start_server* diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..4b7b5e8 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,8 @@ +# Base image: Jekyll 4 +FROM jekyll/jekyll:4 + +# Copy Gemfile and Gemfile.lock into the container +COPY Gemfile Gemfile.lock ./ + +# Install Ruby gems +RUN bundle install diff --git a/Gemfile b/Gemfile index c5f2965..68bad85 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,7 @@ source 'https://rubygems.org' -raise 'Ruby should be >=2.0' unless RUBY_VERSION.to_f >= 2.0 -gem 'github-pages' -gem "webrick", "~> 1.7" +raise 'Ruby should be >=3.0' unless RUBY_VERSION.to_f >= 3.0 +gem "github-pages", group: :jekyll_plugins +gem "webrick" +group :jekyll_plugins do + gem "jekyll-last-modified-at" +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..944c43a --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,283 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (7.2.2.1) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + colorator (1.1.0) + commonmarker (0.23.11) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) + csv (3.3.2) + dnsruby (1.72.3) + base64 (~> 0.2.0) + simpleidn (~> 0.2.1) + drb (2.2.1) + em-websocket (0.5.3) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0) + ethon (0.16.0) + ffi (>= 1.15.0) + eventmachine (1.2.7) + execjs (2.10.0) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + ffi (1.17.1-x86_64-linux-musl) + forwardable-extended (2.6.0) + gemoji (4.1.0) + github-pages (232) + github-pages-health-check (= 1.18.2) + jekyll (= 3.10.0) + jekyll-avatar (= 0.8.0) + jekyll-coffeescript (= 1.2.2) + jekyll-commonmark-ghpages (= 0.5.1) + jekyll-default-layout (= 0.1.5) + jekyll-feed (= 0.17.0) + jekyll-gist (= 1.5.0) + jekyll-github-metadata (= 2.16.1) + jekyll-include-cache (= 0.2.1) + jekyll-mentions (= 1.6.0) + jekyll-optional-front-matter (= 0.3.2) + jekyll-paginate (= 1.1.0) + jekyll-readme-index (= 0.3.0) + jekyll-redirect-from (= 0.16.0) + jekyll-relative-links (= 0.6.1) + jekyll-remote-theme (= 0.4.3) + jekyll-sass-converter (= 1.5.2) + jekyll-seo-tag (= 2.8.0) + jekyll-sitemap (= 1.4.0) + jekyll-swiss (= 1.0.0) + jekyll-theme-architect (= 0.2.0) + jekyll-theme-cayman (= 0.2.0) + jekyll-theme-dinky (= 0.2.0) + jekyll-theme-hacker (= 0.2.0) + jekyll-theme-leap-day (= 0.2.0) + jekyll-theme-merlot (= 0.2.0) + jekyll-theme-midnight (= 0.2.0) + jekyll-theme-minimal (= 0.2.0) + jekyll-theme-modernist (= 0.2.0) + jekyll-theme-primer (= 0.6.0) + jekyll-theme-slate (= 0.2.0) + jekyll-theme-tactile (= 0.2.0) + jekyll-theme-time-machine (= 0.2.0) + jekyll-titles-from-headings (= 0.5.3) + jemoji (= 0.13.0) + kramdown (= 2.4.0) + kramdown-parser-gfm (= 1.1.0) + liquid (= 4.0.4) + mercenary (~> 0.3) + minima (= 2.5.1) + nokogiri (>= 1.16.2, < 2.0) + rouge (= 3.30.0) + terminal-table (~> 1.4) + webrick (~> 1.8) + github-pages-health-check (1.18.2) + addressable (~> 2.3) + dnsruby (~> 1.60) + octokit (>= 4, < 8) + public_suffix (>= 3.0, < 6.0) + typhoeus (~> 1.3) + html-pipeline (2.14.3) + activesupport (>= 2) + nokogiri (>= 1.4) + http_parser.rb (0.8.0) + i18n (1.14.7) + concurrent-ruby (~> 1.0) + jekyll (3.10.0) + addressable (~> 2.4) + colorator (~> 1.0) + csv (~> 3.0) + em-websocket (~> 0.5) + i18n (>= 0.7, < 2) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 2.0) + kramdown (>= 1.17, < 3) + liquid (~> 4.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (>= 1.7, < 4) + safe_yaml (~> 1.0) + webrick (>= 1.0) + jekyll-avatar (0.8.0) + jekyll (>= 3.0, < 5.0) + jekyll-coffeescript (1.2.2) + coffee-script (~> 2.2) + coffee-script-source (~> 1.12) + jekyll-commonmark (1.4.0) + commonmarker (~> 0.22) + jekyll-commonmark-ghpages (0.5.1) + commonmarker (>= 0.23.7, < 1.1.0) + jekyll (>= 3.9, < 4.0) + jekyll-commonmark (~> 1.4.0) + rouge (>= 2.0, < 5.0) + jekyll-default-layout (0.1.5) + jekyll (>= 3.0, < 5.0) + jekyll-feed (0.17.0) + jekyll (>= 3.7, < 5.0) + jekyll-gist (1.5.0) + octokit (~> 4.2) + jekyll-github-metadata (2.16.1) + jekyll (>= 3.4, < 5.0) + octokit (>= 4, < 7, != 4.4.0) + jekyll-include-cache (0.2.1) + jekyll (>= 3.7, < 5.0) + jekyll-last-modified-at (1.3.2) + jekyll (>= 3.7, < 5.0) + jekyll-mentions (1.6.0) + html-pipeline (~> 2.3) + jekyll (>= 3.7, < 5.0) + jekyll-optional-front-matter (0.3.2) + jekyll (>= 3.0, < 5.0) + jekyll-paginate (1.1.0) + jekyll-readme-index (0.3.0) + jekyll (>= 3.0, < 5.0) + jekyll-redirect-from (0.16.0) + jekyll (>= 3.3, < 5.0) + jekyll-relative-links (0.6.1) + jekyll (>= 3.3, < 5.0) + jekyll-remote-theme (0.4.3) + addressable (~> 2.0) + jekyll (>= 3.5, < 5.0) + jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0) + rubyzip (>= 1.3.0, < 3.0) + jekyll-sass-converter (1.5.2) + sass (~> 3.4) + jekyll-seo-tag (2.8.0) + jekyll (>= 3.8, < 5.0) + jekyll-sitemap (1.4.0) + jekyll (>= 3.7, < 5.0) + jekyll-swiss (1.0.0) + jekyll-theme-architect (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-cayman (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-dinky (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-hacker (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-leap-day (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-merlot (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-midnight (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-minimal (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-modernist (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-primer (0.6.0) + jekyll (> 3.5, < 5.0) + jekyll-github-metadata (~> 2.9) + jekyll-seo-tag (~> 2.0) + jekyll-theme-slate (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-tactile (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-time-machine (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-titles-from-headings (0.5.3) + jekyll (>= 3.3, < 5.0) + jekyll-watch (2.2.1) + listen (~> 3.0) + jemoji (0.13.0) + gemoji (>= 3, < 5) + html-pipeline (~> 2.2) + jekyll (>= 3.0, < 5.0) + json (2.9.1) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.4) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.5) + mercenary (0.3.6) + minima (2.5.1) + jekyll (>= 3.5, < 5.0) + jekyll-feed (~> 0.9) + jekyll-seo-tag (~> 2.1) + minitest (5.25.4) + net-http (0.6.0) + uri + nokogiri (1.18.2-x86_64-linux-musl) + racc (~> 1.4) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + pathutil (0.16.2) + forwardable-extended (~> 2.6) + public_suffix (5.1.1) + racc (1.8.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) + ffi (~> 1.0) + rexml (3.4.0) + rouge (3.30.0) + rubyzip (2.4.1) + safe_yaml (1.0.5) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sawyer (0.9.2) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) + securerandom (0.4.1) + simpleidn (0.2.3) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + typhoeus (1.4.1) + ethon (>= 0.9.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (1.8.0) + uri (1.0.2) + webrick (1.9.1) + +PLATFORMS + x86_64-linux-musl + +DEPENDENCIES + github-pages + jekyll-last-modified-at + webrick + +BUNDLED WITH + 2.3.25 diff --git a/_config.yml b/_config.yml index 36df422..f0f029b 100644 --- a/_config.yml +++ b/_config.yml @@ -3,7 +3,7 @@ # # Name of your site (displayed in the header) -name: Java User Group Darmstadt +title: Java User Group Darmstadt # Short bio or description (displayed in the header) description: Community der Java Anwender in und um Darmstadt @@ -78,9 +78,10 @@ sass: # style: :expanded # You might prefer to minify using :compressed # Use the following plug-ins -gems: +plugins: - jekyll-sitemap # Create a sitemap using the official Jekyll sitemap gem - jemoji + - jekyll-last-modified-at # Exclude these files from your production _site exclude: @@ -89,3 +90,4 @@ exclude: - LICENSE - README.md - CNAME + - .idea diff --git a/_includes/meta.html b/_includes/meta.html index b8991e9..610a19b 100644 --- a/_includes/meta.html +++ b/_includes/meta.html @@ -10,12 +10,12 @@ {% endif %} - + {% if page.title %} - + {% else %} - + {% endif %} {% if page.thumbnail %} diff --git a/_layouts/default.html b/_layouts/default.html index b423788..e29e43c 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,13 +1,13 @@ - {% if page.title %}{{ page.title }} | {% endif %}{{ site.name }} – {{ site.description }} + {% if page.title %}{{ page.title }} | {% endif %}{{ site.title }} – {{ site.description }} {% include meta.html %} - + @@ -18,7 +18,7 @@
-

{{ site.name }}

+

{{ site.title }}

{{ site.description }}

diff --git a/_layouts/poster.html b/_layouts/poster.html index 9c164fe..f2402fa 100644 --- a/_layouts/poster.html +++ b/_layouts/poster.html @@ -1,7 +1,7 @@ - {% if page.title %}{{ page.title }} | {% endif %}{{ site.name }} – {{ site.description }} + {% if page.title %}{{ page.title }} | {% endif %}{{ site.title }} – {{ site.description }} {% include meta.html %} @@ -12,7 +12,7 @@ - + @@ -25,7 +25,7 @@ {{ content }}
-
Mit freundlicher Unterstützung von: +
Mit freundlicher Unterstützung von: {% for sponsor in site.data.sponsors %} {% endfor %} diff --git a/docker-compose.yml b/docker-compose.yml index ae99080..f1a4ea0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,10 @@ -volumes: - jugda_jekyll_data: - name: jugda_jekyll_data services: jekyll: - image: jekyll/jekyll:3.8 - command: jekyll serve --watch + build: . + image: jugda/jekyll + command: jekyll serve --watch --incremental --host=0.0.0.0 + user: "${UID:-1000}:${GID:-1000}" ports: - 4000:4000 volumes: - .:/srv/jekyll:cached - - jugda_jekyll_data:/usr/local/bundle diff --git a/events.ics b/events.ics index 42ae560..8e82854 100644 --- a/events.ics +++ b/events.ics @@ -5,8 +5,8 @@ BEGIN:VCALENDAR VERSION:2.0 PRODID:-//JUG DA//Veranstaltungskalender//DE METHOD:PUBLISH -X-WR-CALNAME:{{ site.name }} -X-WR-CALDESC:Veranstaltungen der {{ site.name }} +X-WR-CALNAME:{{ site.title }} +X-WR-CALDESC:Veranstaltungen der {{ site.title }} CALSCALE:GREGORIAN BEGIN:VTIMEZONE TZID:Europe/Berlin @@ -34,7 +34,7 @@ DESCRIPTION:Java User Group Darmstadt\n\n{{ post.title }}{% if post.speaker %} ( LOCATION:{{ post.location | replace: ",", "\," }} {% include getDateWithStartAndEndTimeFromEvent.html event=post %}DTSTART;TZID={{ site.timezone }}:{{ dateWithStartTime | date: "%Y%m%dT%H%M00" }} DTEND;TZID={{ site.timezone }}:{{ dateWithEndTime | date: "%Y%m%dT%H%M00" }} -DTSTAMP:{% assign offset = post.date | date: "%:::z" | times: 3600 %}{{ dateWithStartTime | date: "%s" | minus: offset | date: "%Y%m%dT%H%M00Z" }} +DTSTAMP:{% assign offset = post.last_modified_at | date: "%:::z" | times: 3600 %}{{ post.last_modified_at | date: "%s" | minus: offset | date: "%Y%m%dT%H%M00Z" }} URL:{{ site.url }}{{ post.url }} CLASS:PUBLIC END:VEVENT diff --git a/events.json b/events.json index f88766f..a410212 100644 --- a/events.json +++ b/events.json @@ -9,6 +9,7 @@ layout: null {% if postDateInSeconds > fromInSeconds %} { "uid": "{{ post.date | date: "%Y%m%d" }}@jug-da.de", +"lastModified": "{% assign offset = post.last_modified_at | date: "%:::z" | times: 3600 %}{{ post.last_modified_at | date: "%s" | minus: offset | date: "%Y%m%dT%H%M00Z" }}", "summary": "{{ post.title | smartify }}{% if post.speaker %} ({{ post.speaker | map: "name" | join: ", " }}){% endif %}", "title": "{{ post.title | smartify }}", "description": "{{ post.content | strip_html | normalize_whitespace | truncatewords: 100 }}", diff --git a/feed.xml b/feed.xml index 26157d3..a5907ae 100644 --- a/feed.xml +++ b/feed.xml @@ -4,7 +4,7 @@ layout: null - {{ site.name | xml_escape }} + {{ site.title | xml_escape }} {{ site.description | xml_escape }} {{ site.url }} diff --git a/js/script.js b/js/script.js index 4e7e215..046c051 100644 --- a/js/script.js +++ b/js/script.js @@ -40,7 +40,7 @@ function ical(summary, description, location, start, end, url, uid) { "DTEND;TZID={{ site.timezone }}:" + end + nl + "SUMMARY:JUG DA: " + summary + nl + "LOCATION:" + location.replace(/\,/g, '\\,') + nl + - "DESCRIPTION:{{ site.name }}\\n\\n" + summary + "\\n\\n" + description + nl + + "DESCRIPTION:{{ site.title }}\\n\\n" + summary + "\\n\\n" + description + nl + "URL:" + url + nl + "STATUS:CONFIRMED" + nl + "CLASS:PUBLIC" + nl +