WIP

Author: stm2

.github/workflows/pages.yml

@@ -34,23 +34,22 @@ jobs:
         run: sudo apt update
       - name: Install dependencies
         run: |
-          sudo apt install libexpat1-dev liblua5.2-dev lua5.2 luarocks libtolua-dev libncurses5-dev libsqlite3-dev libiniparser-dev libcjson-dev libbsd-dev cppcheck shellcheck clang-tools iwyu
+          sudo apt install libutf8proc-dev libexpat1-dev liblua5.2-dev lua5.2 luarocks libtolua-dev libncurses5-dev libsqlite3-dev libiniparser-dev libcjson-dev libbsd-dev cppcheck shellcheck clang-tools iwyu
           luarocks install lunitx --local
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
       - name: Build and Test
-        uses: ashutoshvarma/action-cmake-build@master
+        uses: threeal/cmake-action@v1.1.0
         with:
           build-dir: ${{ runner.workspace }}/server/build
-          build-type: Debug
+          args: "-DCMAKE_BUILD_TYPE=Debug"
           run-test: true
-          ctest-options: --output-on-failure
 
       - name: Setup Pages
-        uses: actions/configure-pages@v2
+        uses: actions/configure-pages@v3
       - name: Create demos
         run: |
           cd stm-jekyll
@@ -61,7 +60,7 @@ jobs:
           source: ./stm-jekyll
           destination: ./_site
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v2
 
   # Deployment job
   deploy:
@@ -73,4 +72,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v2

stm-jekyll/Gemfile

@@ -8,10 +8,9 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-# gem "jekyll", "~> 3.8.6"
-
+#gem "jekyll", "~> 4.3.2"
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
-gem "minima", "~> 2.0"
+gem "minima", "~> 2.5"
 # gem "architect", "~> 0.2.0"
 
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
@@ -21,15 +20,21 @@ gem "github-pages", group: :jekyll_plugins
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-  gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-feed", "~> 0.12"
 end
 
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
 # and associated library.
-install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
-  gem "tzinfo", "~> 1.2"
+platforms :mingw, :x64_mingw, :mswin, :jruby do
+  gem "tzinfo", ">= 1", "< 3"
   gem "tzinfo-data"
 end
 
 # Performance-booster for watching directories on Windows
-gem "wdm", "~> 0.1.0", :install_if => Gem.win_platform?
+gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
+
+# Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem
+# do not have a Java counterpart.
+gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]
+
+gem "webrick"

stm-jekyll/_config.yml

@@ -20,6 +20,7 @@ description: >- # this means to ignore newlines until "baseurl:"
 baseurl: "/server" # the subpath of your site, e.g. /blog
 url: "http://stm2.github.io" # the base hostname & protocol for your site, e.g. http://example.com
 github_username:  stm2
+repository: stm2/server
 
 # Build settings
 markdown: kramdown

stm-jekyll/_data/crs/eressea.md

@@ -8,6 +8,6 @@ crs:
   - 1000-demo.cr
   - 1000-nice.cr
   - 1000-foe.cr
-date: 2022-09-08
+date: 2023-08-30
 ---
 An example with all sorts of stuff that could go on in an Eressea game

stm-jekyll/_data/crs/example.md

@@ -3,6 +3,6 @@ name: Demo 001
 description: A more complex CR
 crs:
   - 334-42.cr
-date: 2022-09-08
+date: 2023-08-30
 ---
 An example with different types of terrains, ships, lighthouses, and a battle.

stm-jekyll/demos.md

@@ -12,12 +12,12 @@ CR:
 CRs:
   {% endif -%}
   {% for cr in demo.crs limit:1 -%}
-[{{ cr }}](demos/{{ cr | replace: ".cr", ".html" }})
-<span style="font-size:small;"><a href="demos/{{ cr }}">(download)</a></span>
+[{{ cr }}]({{ site.baseurl }}/demos/{{ cr | replace: ".cr", ".html" }})
+<span style="font-size:small;"><a href="{{ site.baseurl }}/demos/{{ cr }}">(download)</a></span>
   {% endfor -%}
   {% for cr in demo.crs offset:continue -%}
-, [{{ cr }}](demos/{{ cr | replace: ".cr", ".html" }})
-<span style="font-size:small;"><a href="demos/{{ cr }}">(download)</a></span>
+, [{{ cr }}]({{ site.baseurl }}/demos/{{ cr | replace: ".cr", ".html" }})
+<span style="font-size:small;"><a href="{{ site.baseurl }}/demos/{{ cr }}">(download)</a></span>
   {% endfor %}
 {% if demo.description %}{{ demo.description }}{% endif %}
 

stm-jekyll/scripts/create_demos.sh

@@ -13,17 +13,19 @@ cp demo/reports/*cr stm-jekyll/_data/crs
 cd stm-jekyll
 
 for filename in _data/crs/*md; do
-  base=${filename%.*}
-  basebase=$(basename "$base")
-  php scripts/cr2svg.php --annotate $base.md _demos/$basebase.md
+  base="${filename%.*}"
+  basebase="$(basename "$base")"
+  php scripts/cr2svg.php --annotate "$base.md" "_demos/$basebase.md"
 done
 
 for filename in _data/crs/*cr; do
-  base=${filename%.*}
-  basebase=$(basename "$base")
-  if [ -e $base.md ]; then
-    php scripts/cr2svg.php --md $base.md $base.cr _demos/$basebase.md
+  base="${filename%.*}"
+  basebase="$(basename "$base")"
+  if [ -e "$base.md" ]; then
+    php scripts/cr2svg.php --md "$base.md" "$base.cr" "_demos/$basebase.md"
   else
-    php scripts/cr2svg.php --html $base.cr _demos/$basebase.md
+    php scripts/cr2svg.php --html "$base.cr" "_demos/$basebase.md"
   fi
+  cp "$filename" "_demos/$basebase.cr"
 done
+