Feature/rubyupgrade

.github/workflows/website-deploy.yml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1
+          ruby-version: 3.3
           bundler-cache: true
       - name: install dependencies
         run: |

Gemfile

@@ -33,3 +33,8 @@ gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
 gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]
 
 gem 'jekyll-minibundle'
+gem 'nanoc'
+gem 'stringex'
+gem 'ostruct'
+gem 'logger'
+gem 'pstore'

Gemfile.lock

@@ -3,22 +3,32 @@ GEM
   specs:
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.2.0)
     bigdecimal (3.1.8)
+    coderay (1.1.3)
     colorator (1.1.0)
+    colored (1.2)
     concurrent-ruby (1.3.4)
+    cri (2.15.12)
+    ddmetrics (1.1.0)
+    ddplugin (1.0.3)
+    diff-lcs (1.5.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.17.0)
+    ffi (1.17.0-x86_64-linux-gnu)
     forwardable-extended (2.6.0)
     google-protobuf (4.28.2-x86_64-linux)
       bigdecimal
       rake (>= 13)
     http_parser.rb (0.8.0)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    jekyll (4.3.3)
+    immutable-ruby (0.2.0)
+      concurrent-ruby (~> 1.1)
+      sorted_set (~> 1.0)
+    jekyll (4.3.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -43,6 +53,7 @@ GEM
       jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
+    json_schema (0.21.0)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -51,30 +62,89 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.1)
+    memo_wise (1.10.0)
     mercenary (0.4.0)
-    minima (2.5.1)
+    method_source (1.1.0)
+    minima (2.5.2)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
+    nanoc (4.13.0)
+      addressable (~> 2.5)
+      colored (~> 1.2)
+      nanoc-checking (~> 1.0, >= 1.0.2)
+      nanoc-cli (= 4.13.0)
+      nanoc-core (= 4.13.0)
+      nanoc-deploying (~> 1.0)
+      parallel (~> 1.12)
+      tty-command (~> 0.8)
+      tty-which (~> 0.4)
+    nanoc-checking (1.0.5)
+      nanoc-cli (~> 4.12, >= 4.12.5)
+      nanoc-core (~> 4.12, >= 4.12.5)
+    nanoc-cli (4.13.0)
+      cri (~> 2.15)
+      diff-lcs (~> 1.3)
+      nanoc-core (= 4.13.0)
+      pry
+      zeitwerk (~> 2.1)
+    nanoc-core (4.13.0)
+      base64 (~> 0.2)
+      concurrent-ruby (~> 1.1)
+      ddmetrics (~> 1.0)
+      ddplugin (~> 1.0)
+      immutable-ruby (~> 0.1)
+      json_schema (~> 0.19)
+      memo_wise (~> 1.5)
+      psych (>= 4.0, < 6.0)
+      slow_enumerator_tools (~> 1.0)
+      tty-platform (~> 0.2)
+      zeitwerk (~> 2.1)
+    nanoc-deploying (1.0.2)
+      nanoc-checking (~> 1.0)
+      nanoc-cli (~> 4.11, >= 4.11.15)
+      nanoc-core (~> 4.11, >= 4.11.15)
+    ostruct (0.6.0)
+    parallel (1.26.3)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pstore (0.1.3)
+    psych (5.1.2)
+      stringio
     public_suffix (6.0.1)
     rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.3.6)
-      strscan
-    rouge (4.3.0)
+    rbtree (0.4.6)
+    rexml (3.3.7)
+    rouge (4.4.0)
     safe_yaml (1.0.5)
-    sass-embedded (1.77.8)
-      google-protobuf (~> 4.26)
-      rake (>= 13)
-    strscan (3.1.0)
+    sass-embedded (1.79.2-x86_64-linux-gnu)
+      google-protobuf (~> 4.27)
+    set (1.1.0)
+    slow_enumerator_tools (1.1.0)
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
+    stringex (2.8.6)
+    stringio (3.1.1)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    unicode-display_width (2.5.0)
+    tty-color (0.6.0)
+    tty-command (0.10.1)
+      pastel (~> 0.8)
+    tty-platform (0.3.0)
+    tty-which (0.5.0)
+    unicode-display_width (2.6.0)
     webrick (1.8.1)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   x86_64-linux
@@ -84,10 +154,15 @@ DEPENDENCIES
   jekyll (~> 4.3.3)
   jekyll-feed (~> 0.12)
   jekyll-minibundle
+  logger
   minima (~> 2.5)
+  nanoc
+  ostruct
+  pstore
+  stringex
   tzinfo (>= 1, < 3)
   tzinfo-data
   wdm (~> 0.1.1)
 
 BUNDLED WITH
-   2.3.15
+   2.5.16

README.md

@@ -1,8 +1,9 @@
 # XCSoar.org - Website
 
-1. Install dependencies
+1. Run Ruby Docker image
    ```
-   sudo apt-get install bundler yui-compressor librsvg2-bin build-essential ruby-dev
+   docker run -v ./:/data -it ruby:3.3.5  /bin/bash
+   cd /data
    ```
 
 2. Install ruby dependencies
@@ -19,7 +20,9 @@
 
 1. Generate a stub for the new post
    ```
-   bundle exec rake new_post["XCSoar 6.8.12 released"]
+   git config --global --add safe.directory /data
+   apt update && apt install -y vim
+   bundle exec rake new_post["XCSoar 7.55 released"]
    ```
 
 2. Edit the new post, created in `./_posts`

develop/infrastructure.md

@@ -6,18 +6,11 @@ title: Infrastructure and Hosting
 ---
 ## Physical Machines
 
-- **xcsoar.org** is a VM on hostrain.dd.com.au.
-  A commercial server run at iWeb by Scott Penrose.
-  rsync backup is done nightly to secondary disk.
-  *TODO - consider offsite copy of Trac (all other content is reproducible from git)*
-- **download.xcsoar.org** is a commercial web site (virtual on a shared machine).
-  It is run at iWeb by Scott Penrose.
-  Backup is done by service provider
-- **mapgen.xcsoar.org** is run by Philipp Nierkamp.
+- **https://xcsoar.org** is a VM on hetzner.
+
+- **mapgen.xcsoar.org** is run by Philipp Wollschlegel.
 
 ## Other
 
-- Our **Sourceforge** project has admins of Scott Penrose,
-Max Kellermann and John Wharington.
 - **DNS** is registered at [bensdomain.com](http://www.bensdomains.com),
 is hosted on machines in Australia and Canada and is run by Scott Penrose.