Updates version, ci and add sitemap (#53)

ia3andy · web-flow · commit 1741eab3cbab · 2025-02-12T22:59:30.000+01:00
diff --git a/.github/workflows/build-pr-preview.yml b/.github/workflows/build-pr-preview.yml
@@ -0,0 +1,27 @@
+name: Build PR Preview
+
+on:
+  pull_request:
+
+jobs:
+  build-preview:
+    name: Build Preview
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Generate blog
+        uses: quarkiverse/quarkus-roq@v1
+        with:
+          github-pages: 'false'
+
+      - name: Store PR id
+        run: |
+          echo ${{ github.event.number }} > ./target/roq/pr-id.txt
+
+      - name: Uploading artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: blog
+          path: ./target/roq
+          retention-days: 3
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -1,66 +1,30 @@
-## Deploy to GH-Pages for your Quarkus Roq blog.
-name: Quarkus Roq Deploy CI
+## Deploy to GH-Pages for your Quarkus Roq site.
+name: Roq Site Deploy
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master ]   # Switch to the branch which should be deployed to GitHub Pages
   workflow_dispatch:
 
-env:
-  QUARKUS_ROQ_GENERATOR_BATCH: true
-  TZ: Europe/Paris
-
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: 21
-          distribution: 'temurin'
-          cache: 'maven'
-      - name: Get GitHub Pages URL
-        id: get_url
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          url=$(gh api "repos/$GITHUB_REPOSITORY/pages" --jq '.html_url');echo "ghp-url=$url";
-          path=$(echo "$url" | sed -E 's|https?://[^/]+(/.*)?|\1|')
-          url=$(echo "$url" | sed -E 's|(https?://[^/]+).*|\1|')
-          if [ -z "$path" ]; then
-            path="/"
-          fi
-          echo "SITE_URL=$url"; echo "SITE_URL=$url" >> $GITHUB_ENV;
-          echo "SITE_PATH=$path"; echo "SITE_PATH=$path" >> $GITHUB_ENV;
-      - name: Build & Generate Blog
-        run: mvn -B package quarkus:run -DskipTests -Dquarkus.http.root-path=$SITE_PATH -Dsite.url=$SITE_URL
-      - name: Upload site as artifact
-        uses: actions/upload-artifact@v4
+      - name: Generate Roq Site
+        uses: quarkiverse/quarkus-roq@v1
         with:
-          name: site
-          path: target/roq
-          retention-days: 1
+          github-token: ${{ secrets.GITHUB_TOKEN }}   # Used to automatically get the GitHub Pages url
   deploy:
-    runs-on: ubuntu-latest
-    needs: build
-    permissions:
-      pages: write      # to deploy to Pages
-      id-token: write   # to verify the deployment originates from an appropriate source
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
+    permissions:
+      pages: write      # to deploy to Pages
+      id-token: write   # to verify the deployment originates from an appropriate source
+    runs-on: ubuntu-latest
+    needs: build
     steps:
-      - name: Download Built site
-        uses: actions/download-artifact@v4
-        with:
-          name: site
-          path: _site
-      - name: Setup Pages
-        uses: actions/configure-pages@v5
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/surge-deploy-preview.yml b/.github/workflows/surge-deploy-preview.yml
@@ -0,0 +1,57 @@
+name: Surge.sh PR Preview
+
+on:
+  workflow_run:
+    workflows: [ "Build PR Preview" ]
+    types:
+      - completed
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  preview:
+    runs-on: ubuntu-latest
+    if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
+    permissions:
+      pull-requests: write # Required to update PR status comment
+    steps:
+      - name: Download blog artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: blog
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
+
+      - name: Retrieve PR id
+        id: pr
+        run: |
+          echo "id=$(<pr-id.txt)" >> $GITHUB_OUTPUT
+          rm -f .pr-id
+
+      - name: Publishing blog to gh-pages
+        id: deploy-blog
+        run: npx surge ./ --domain https://marsjug-org-${{ steps.pr.outputs.id }}-preview.surge.sh --token ${{ secrets.SURGE_TOKEN }}
+
+      - name: Update PR status comment on success
+        uses: quarkusio/action-helpers@main
+        with:
+          action: maintain-one-comment
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          pr-number: ${{ steps.pr.outputs.id }}
+          body: |
+            🚀 PR Preview for marsjug.org has been successfully deployed!
+            It's available at https://marsjug-org-${{ steps.pr.outputs.id }}-preview.surge.sh and will be removed when the PR closes.
+          body-marker: <!-- Preview status comment marker -->
+
+      - name: Update PR status comment on failure
+        uses: quarkusio/action-helpers@main
+        if: ${{ failure() }}
+        with:
+          action: maintain-one-comment
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          pr-number: ${{ steps.pr.outputs.id }}
+          body: |
+            😭 Deploy PR Preview failed.
+          body-marker: <!-- Preview status comment marker -->
diff --git a/.github/workflows/surge-teardown-preview.yml b/.github/workflows/surge-teardown-preview.yml
@@ -0,0 +1,25 @@
+name: Surge.sh Teardown
+
+on:
+  pull_request_target:
+    # when using teardown: 'true', add default event types + closed event type
+    types: [closed]
+
+jobs:
+  preview:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write # Required to update PR status comment
+    steps:
+      - name: Teardown Surge.sh preview (blog)
+        id: teardown-blog
+        run: npx surge teardown https://marsjug-org-${{ github.event.number }}-preview.surge.sh --token ${{ secrets.SURGE_TOKEN }} || true
+      - name: Update PR status comment
+        uses: quarkusio/action-helpers@main
+        with:
+          action: maintain-one-comment
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          pr-number: ${{ github.event.number }}
+          body: |
+            🙈 The PR is closed and the preview is expired.
+          body-marker: <!-- Preview status comment marker -->
diff --git a/content/partenaires.html b/content/partenaires.html
@@ -8,6 +8,6 @@
 {#for partenaire in cdi:partenaires.list}
   <div class="span4">
     <h3>{partenaire.name}</h3>
-    <p><a href="{partenaire.url}" target="_blank"><img src="{site.image('partenaires').resolve(partenaire.image)}"/></a></p>
+    <p><a href="{partenaire.url}" target="_blank"><img src="{site.image(str:fmt("partenaires/%s", partenaire.image))}"/></a></p>
   </div>
 {/}
diff --git a/content/reunions/2025/2025-01-14-cnative/index.md b/content/reunions/2025/2025-01-14-cnative/index.md
diff --git a/content/reunions/2025/2025-02-04-clement/index.md b/content/reunions/2025/2025-02-04-clement/index.md
@@ -6,7 +6,7 @@ speakers:
 inscription: https://www.meetup.com/marseille-java-user-group-meetup/events/305735018/
 location: tricentis
 date: 2025-02-04 19:00:00 +0100
-image: static/assets/images/marioTuyau.jpg
+image: marioTuyau.jpg
 ---
 Le développement logiciel est souvent un challenge, d'autant plus quand on a de
 fortes contraintes matérielles : peu de CPU, peu de RAM, peu voire pas de
diff --git a/content/reunions/2025/2025-02-04-clement/marioTuyau.jpg b/content/reunions/2025/2025-02-04-clement/marioTuyau.jpg
diff --git a/content/reunions/2025/2025-03-05-scraly/index.md b/content/reunions/2025/2025-03-05-scraly/index.md
@@ -6,7 +6,7 @@ speakers:
 inscription: https://www.meetup.com/marseille-java-user-group-meetup/events/306140214
 location: tricentis
 date: 2025-03-05 19:00:00 +0100
-image: "/static/assets/images/understandingk8s.jpg"
+image: "understandingk8s.jpg"
 ---
 Kubernetes est devenu le standard de facto pour déployer et exploiter des applications conteneurisées. Mais comprendre Kubernetes peut s’avérer difficile ou prendre beaucoup de temps.
 
diff --git a/content/reunions/2025/2025-03-05-scraly/understandingk8s.jpg b/content/reunions/2025/2025-03-05-scraly/understandingk8s.jpg
diff --git a/content/sitemap.xml b/content/sitemap.xml
@@ -0,0 +1 @@
+{#include fm/sitemap.xml}
diff --git a/pom.xml b/pom.xml
@@ -12,9 +12,10 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>3.16.2</quarkus.platform.version>
+        <quarkus.platform.version>3.18.3</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.5.0</surefire-plugin.version>
+        <quarkus-roq.version>1.3.0.Alpha2</quarkus-roq.version>
     </properties>
 
     <dependencyManagement>
@@ -33,7 +34,12 @@
         <dependency>
             <groupId>io.quarkiverse.roq</groupId>
             <artifactId>quarkus-roq</artifactId>
-            <version>1.0.3</version>
+            <version>${quarkus-roq.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkiverse.roq</groupId>
+            <artifactId>quarkus-roq-plugin-sitemap</artifactId>
+            <version>${quarkus-roq.version}</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -54,6 +60,12 @@
             <artifactId>quarkus-junit5</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkiverse.roq</groupId>
+            <artifactId>quarkus-roq-testing</artifactId>
+            <version>${quarkus-roq.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,3 +1,4 @@
 site.collections.reunions=true
 site.collections.reunions.future=true
-quarkus.log.category."io.quarkiverse.roq.frontmatter.deployment.scan".level=DEBUG
+quarkus.log.category."io.quarkiverse.roq.frontmatter.deployment.scan".level=DEBUG
+site.slugify-files=false
diff --git a/src/test/java/SiteTest.java b/src/test/java/SiteTest.java
@@ -0,0 +1,13 @@
+import io.quarkiverse.roq.testing.RoqAndRoll;
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+@RoqAndRoll
+public class SiteTest {
+
+    @Test
+    public void test() {
+        // This will test all pages
+    }
+}
diff --git a/templates/layouts/default.html b/templates/layouts/default.html
@@ -6,7 +6,6 @@
   {#seo page site /}
   {#rss site /}
 
-  <base href="{site.url.root.relative}">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
   <link rel="shortcut icon" href="{site.imagesDirUrl.resolve('favicon.ico')}" type="image/x-icon">
