From 44bd99fdb67e84c0ba5b1256883c684e4a93aecf Mon Sep 17 00:00:00 2001
From: Alexandre l'Heritier <alexandre.lheritier@cea.fr>
Date: Thu, 16 Jun 2022 16:47:36 +0200
Subject: [PATCH 1/2] [CI] Update CI -- Add Ninja ; Update image

---
 .github/workflows/gh-pages.yml | 45 +++++++++++++++-------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index aef72a29194a..00e716c3587a 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -9,10 +9,8 @@ on:
 
 env:
 
-  # Arcane
-  ARCANE_BUILD_DIR: '/__w/arcaneframework.github.io/arcaneframework.github.io/arcane_build'
-  ARCANE_INSTALL_DIR: '/__w/arcaneframework.github.io/arcaneframework.github.io/arcane_install'
-  ARCANE_SOURCE_DIR: '/__w/arcaneframework.github.io/arcaneframework.github.io/arcane'
+  SOURCE_DIR: '/__w/arcaneframework.github.io/arcaneframework.github.io/framework'
+  BUILD_DIR: '/__w/arcaneframework.github.io/arcaneframework.github.io/build'
 
   DOC_DIR: '/__w/arcaneframework.github.io/arcaneframework.github.io/doc'
 
@@ -20,11 +18,10 @@ env:
   CC_KEY_PREFIX: 'doc_gcc-11'
   CCACHE_COMPRESS: true
   CCACHE_COMPRESSLEVEL: 6
-  CCACHE_DIR: '/__w/arcaneframework.github.io/arcaneframework.github.io/ccache'
+  CCACHE_DIR: '/__w/arcane_doc/arcane_doc/ccache'
   CCACHE_MAXSIZE: 5G
 
   # CMake
-  CM_BUILD_OPTS: "-j2"
   CM_BUILD_TYPE: Release
   CM_CCACHE_OPTS: "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
   CM_COMPILER: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++'
@@ -34,11 +31,9 @@ jobs:
     name: Build Arcane and documentations
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/arcaneframework/ubuntu-2004_gcc-11:latest
-    strategy:
-      fail-fast: false
-    steps:
+      image: ghcr.io/arcaneframework/ubuntu-2204:gcc-12_clang-14_doc_20220617
 
+    steps:
       - name: Checkout doc
         uses: actions/checkout@v3
         with:
@@ -48,7 +43,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: arcaneframework/framework
-          path: ${{ env.ARCANE_SOURCE_DIR }}
+          path: ${{ env.SOURCE_DIR }}
           submodules: true
 
       - name: Get date
@@ -63,40 +58,40 @@ jobs:
           key: ${{ env.CC_KEY_PREFIX }}-arcane-${{ env.CM_BUILD_TYPE }}-${{ steps.get-date.outputs.date }}-${{ github.run_number }}
           restore-keys: ${{ env.CC_KEY_PREFIX }}-arcane-${{ env.CM_BUILD_TYPE }}-
 
-      - name: Install missing packages
-        shell: 'bash'
-        run: |
-          apt-get update -y
-          apt-get install -y texlive-full doxygen graphviz
-
       - name: Configure
         shell: bash
-        run: cmake -S ${{ env.ARCANE_SOURCE_DIR }} -B ${{ env.ARCANE_BUILD_DIR }} -DCMAKE_BUILD_TYPE=${{ env.CM_BUILD_TYPE }} ${{ env.CM_CCACHE_OPTS }} ${{ env.CM_COMPILER }}
+        run: |
+          cmake \
+          -S ${{ env.SOURCE_DIR }} \
+          -B ${{ env.BUILD_DIR }} \
+          -GNinja \
+          -DCMAKE_BUILD_TYPE=${{ env.CM_BUILD_TYPE }} \
+          ${{ env.CM_CCACHE_OPTS }} \
+          ${{ env.CM_COMPILER }}
 
       - name: Build
         shell: bash
         run: |
-          cmake --build ${{ env.ARCANE_BUILD_DIR }} ${{ env.CM_BUILD_OPTS }}
+          cmake --build ${{ env.BUILD_DIR }}
 
       - name: Build userdoc
         shell: bash
         run: |
-          cmake --build ${{ env.ARCANE_BUILD_DIR }} ${{ env.CM_BUILD_OPTS }} --target userdoc
+          cmake --build ${{ env.BUILD_DIR }} --target userdoc
 
       - name: Build devdoc
         shell: bash
         run: |
-          cmake --build ${{ env.ARCANE_BUILD_DIR }} ${{ env.CM_BUILD_OPTS }} --target devdoc
-
+          cmake --build ${{ env.BUILD_DIR }} --target devdoc
 
       - name: Move userdoc and devdoc
         shell: bash
         run: |
           rm -rf ${{ env.DOC_DIR }}/arcane
           mkdir -p ${{ env.DOC_DIR }}/arcane
-          mv ${{ env.ARCANE_BUILD_DIR }}/share/userdoc ${{ env.DOC_DIR }}/arcane
-          mv ${{ env.ARCANE_BUILD_DIR }}/share/devdoc ${{ env.DOC_DIR }}/arcane
-          
+          mv ${{ env.BUILD_DIR }}/share/userdoc ${{ env.DOC_DIR }}/arcane
+          mv ${{ env.BUILD_DIR }}/share/devdoc ${{ env.DOC_DIR }}/arcane
+
       - name: Deploy Docs
         uses: peaceiris/actions-gh-pages@v3.8.0
         with:

From 2595bcc2e4316c1ec4774bc9e98602afd9548bae Mon Sep 17 00:00:00 2001
From: Alexandre l'Heritier <alexandre.lheritier@cea.fr>
Date: Fri, 17 Jun 2022 16:26:46 +0200
Subject: [PATCH 2/2] [CI] Modify CCACHE_DIR

---
 .github/workflows/gh-pages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 00e716c3587a..bac7a5f24d99 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -18,7 +18,7 @@ env:
   CC_KEY_PREFIX: 'doc_gcc-11'
   CCACHE_COMPRESS: true
   CCACHE_COMPRESSLEVEL: 6
-  CCACHE_DIR: '/__w/arcane_doc/arcane_doc/ccache'
+  CCACHE_DIR: '/__w/arcaneframework.github.io/arcaneframework.github.io/ccache'
   CCACHE_MAXSIZE: 5G
 
   # CMake