Merge remote-tracking branch 'origin/master' into Mesh_3-news

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: "vendor/bundle"

.github/dependabot.yml

@@ -3,4 +3,12 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "weekly"
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/Deploy_web_site_with_ssh.yml

@@ -15,22 +15,17 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.3'
           bundler-cache: true
       - name: Setup Jekyll
         run: |
           gem install jekyll bundler
-      - name: Update Configuration
-        run: |
-          yq -i '.JB.BASE_PATH = ""' _config.yml
-          yq -i '.baseurl = "${{ vars.CGAL_WEB_SITE_URL }}"' _config.yml
-          yq -i '.JB.ASSET_PATH = "${{ vars.CGAL_WEB_SITE_URL }}/assets/themes/cgal/"' _config.yml
       - name: Remove demo/ (temporarily)
         run: rm -rf demo/
       - name: setup nodejs
         run: npm install
       - name: Build with jekyll
-        run: jekyll build --destination ./_site
+        run: bundle exec jekyll build --destination ./_site
       - name: install ssh keys
         run: |
           install -m 600 -D /dev/null ~/.ssh/id_rsa

.github/workflows/Receive_PR.yml

@@ -14,24 +14,23 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.3'
           bundler-cache: true
       - name: Setup Jekyll
         run: |
           gem install jekyll bundler
       - name: Update Configuration
         run: |
-          yq -i '.JB.BASE_PATH = ""' _config.yml
-          yq -i '.baseurl = "https://cgal.github.io/cgal-web"' _config.yml
-          yq -i '.JB.ASSET_PATH = "https://cgal.github.io/cgal-web/assets/themes/cgal/"' _config.yml
+          yq -i '.JB.BASE_PATH = "https://cgal.github.io/cgal-web"' _config.yml
+          yq -i '.baseurl = "/cgal-web"' _config.yml
       - name: Remove demo/ (temporarily)
         run: rm -rf demo/
       - name: Setup Pages
         uses: actions/configure-pages@v5
       - name: setup nodejs
         run: npm install
       - name: Build with jekyll
-        run: jekyll build --destination ./_site
+        run: bundle exec jekyll build --destination ./_site
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
       - name: Create PR number file
@@ -41,4 +40,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: pr_number
-          path: pr_number.txt
+          path: pr_number.txt

.gitignore

@@ -11,3 +11,5 @@ Thumbs.db
 *~
 .jekyll-cache
 /node_modules
+/vendor/bundle/
+.jekyll-metadata

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+        "recommendations": [
+                "ms-vscode.live-server"
+        ]
+}

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+        "livePreview.defaultPreviewPath": "_site/",
+        "livePreview.serverRoot": "_site/",
+        "livePreview.showServerStatusNotifications": true,
+        "livePreview.autoRefreshPreview": "On Changes to Saved Files",
+        "livePreview.previewDebounceDelay": 1000
+}

FAQ.html

@@ -183,7 +183,7 @@
        to <TT>/etc/apt/sources.list</TT> (note that you only need the pair of lines
        corresponding to the release you are using) and make sure that the package
        <TT>apt-transport-https</TT> is installed. The packages are called
-       <TT>libcgal-dev</TT>, <TT>libcgal-qt5-dev</TT>, <TT>libcgal-demo</TT> and
+       <TT>libcgal-dev</TT>, <TT>libcgal-qt6-dev</TT>, <TT>libcgal-demo</TT> and
        <TT>libcgal-ipelets</TT>. Packages for older CGAL versions are available at
        <A href="http://debian.cgal.org/archive/">http://debian.cgal.org/archive</A>
        or from the official Debian archive.</P>

Gemfile

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+# gem "rails"
+
+gem "jekyll", "~> 4.3"
+
+gem "logger", "~> 1.6"
+
+gem "csv", "~> 3.3"
+
+gem "base64", "~> 0.2.0"

Gemfile.lock

@@ -0,0 +1,88 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    colorator (1.1.0)
+    concurrent-ruby (1.3.4)
+    csv (3.3.0)
+    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)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.28.2-x86_64-linux)
+      bigdecimal
+      rake (>= 13)
+    http_parser.rb (0.8.0)
+    i18n (1.14.6)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.3.4)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 1.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.3, >= 2.3.1)
+      kramdown-parser-gfm (~> 1.0)
+      liquid (~> 4.0)
+      mercenary (>= 0.3.6, < 0.5)
+      pathutil (~> 0.9)
+      rouge (>= 3.0, < 5.0)
+      safe_yaml (~> 1.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    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.4)
+    listen (3.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.1)
+    mercenary (0.4.0)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    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.9)
+    rouge (4.4.0)
+    safe_yaml (1.0.5)
+    sass-embedded (1.80.3)
+      google-protobuf (~> 4.28)
+      rake (>= 13)
+    sass-embedded (1.80.3-x86_64-linux-gnu)
+      google-protobuf (~> 4.28)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.6.0)
+    webrick (1.8.2)
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  base64 (~> 0.2.0)
+  csv (~> 3.3)
+  jekyll (~> 4.3)
+  logger (~> 1.6)
+
+BUNDLED WITH
+   2.5.16

README.md

@@ -5,3 +5,13 @@ This repository contains the official www.cgal.org website and documentation for
 ## Issues ##
 
 Issues should be opened on the [CGAL/cgal](https://github.com/CGAL/cgal/issues) repository.
+
+## Contributing ##
+
+Install Bundler: https://jekyllrb.com/tutorials/using-jekyll-with-bundler/
+
+Then:
+
+```shell
+    bundle exec jekyll serve
+```