Merge pull request #38 from rok4/develop

Release 1.3.1

.github/workflows/build-and-release.yaml

@@ -46,7 +46,9 @@ jobs:
 
     steps:
       - name: Checkout project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Install system dependencies
         run: |
@@ -85,65 +87,35 @@ jobs:
           cd build
           make doc
           cd ..
-          cp README.md CHANGELOG.md dist/
-
-      - name: Upload documentation
-        if: "matrix.os == 'ubuntu-20.04'"
-        uses: actions/upload-artifact@v3
-        with:
-          name: dist-cpp
-          path: dist/
-          if-no-files-found: error
-          retention-days: 1
-
-  commit_documentation:
-    name: Add documentation into gh-pages branch
-    needs: build_and_test
-    if: "always()&&(needs.create_release.outputs.job_status=='success')&&(needs.build_and_test.outputs.job_status=='success')" 
-    runs-on: ubuntu-latest
-
-    steps:
-
-      - name: Checkout project on gh-pages
-        uses: actions/checkout@v3
-        with:
-          ref: 'gh-pages'
-          token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: actions/download-artifact@v3
+          cp docs/mkdocs.yml target/mkdocs.yml
+          cp -r docs/overrides target/
+          cp docs/documentation.md target/docs/documentation.md
+          cp docs/README.hdr.md target/docs/README.md
+          cp docs/CHANGELOG.hdr.md target/docs/CHANGELOG.md
+          cp docs/CONTRIBUTING.hdr.md target/docs/CONTRIBUTING.md
+          sed "s#x.y.z#${{ github.ref_name }}#g" README.md >>target/docs/README.md
+          cat CHANGELOG.md >>target/docs/CHANGELOG.md
+          cat CONTRIBUTING.md >>target/docs/CONTRIBUTING.md
+
+      - name: Setup python
+        uses: actions/setup-python@v4
         with:
-          name: dist-cpp
-          path: artifact/
-
-      - name: Copy version elements to final location
-        run: |
-          mkdir -p docs/versions/${{ github.ref_name }}
-          cp -r artifact/html docs/versions/${{ github.ref_name }}/
-
-      - name: Add pages from templates
-        run: |
-          sed "s#__version__#${{ github.ref_name }}#" templates/mkdocs.template.yml >mkdocs.yml
+          python-version: "3.10"
+          cache: 'pip'
 
-          sed "s#__version__#${{ github.ref_name }}#" templates/documentation.template.md >docs/versions/${{ github.ref_name }}/documentation.md
+      - name: Install Mkdocs
+        run: pip install -r docs/requirements.txt
 
-          sed "s#__version__#${{ github.ref_name }}#" templates/index-version.template.md >docs/versions/${{ github.ref_name }}/index.md
-          cat artifact/README.md >>docs/versions/${{ github.ref_name }}/index.md
-          sed -i "s#x.y.z#${{ github.ref_name }}#g" docs/versions/${{ github.ref_name }}/index.md
-
-
-          cp templates/index-versions.template.md docs/versions/index.md
-          sed "s/^## \(.*\)$/## \1 \n\n[➔ Lien vers la documentation](\1\/index.md) /" artifact/CHANGELOG.md >>docs/versions/index.md
-
-          sed "s#__version__#${{ github.ref_name }}#" templates/latest.template.html >docs/versions/latest/index.html
-          rm -r artifact
-
-      - name: Publish on gh-pages branch
+      - name: Publish documentation
+        if: "matrix.os == 'ubuntu-20.04'"
         run: |
           git config user.name github-actions
           git config user.email [email protected]
-          git add -v docs/versions/${{ github.ref_name }}/ docs/versions/latest/ docs/versions/index.md mkdocs.yml
-          git commit -m "Add documentation for version ${{ github.ref_name }}"
-          git push
+          cd target/
+          mike deploy --push --update-aliases --branch gh-pages -t "Version ${{ github.ref_name }}" ${{ github.ref_name }} latest
+          mike set-default --push --branch gh-pages ${{ github.ref_name }}
+
 
   delete_version:
     name: Remove release and tag if error occured

.github/workflows/pr-auto-labeler.yml

@@ -1,6 +1,6 @@
 name: "🏷 PR Labeler"
 on:
-  - pull_request_target
+  - pull_request
 
 permissions:
   contents: read
@@ -10,6 +10,6 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v4
+      - uses: actions/labeler@v5
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"

.gitignore

@@ -1,3 +1,4 @@
 build
 dist
-.vscode
+target
+.vscode

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.3.1
+
+### [Fixed]
+
+* `S3Context` : pour éviter des conflits dans une utilisation multithreadée, la sortie de la fonction HMAC (openssl) est dédiée.
+
 ## 1.3.0
 
 ### [Added]

CMakeLists.txt

@@ -131,7 +131,7 @@ endif(UNITTEST_ENABLED)
 if(DOC_ENABLED)
 
     set(DOXYGEN_DOXYFILE_ENCODING UTF-8)
-    set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist)
+    set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/target/docs)
     set(DOXYGEN_OUTPUT_LANGUAGE french)
     set(DOXYGEN_INPUT_ENCODING UTF-8)
     set(DOXYGEN_IMAGE_PATH docs/images)

docs/CHANGELOG.hdr.md

@@ -0,0 +1,4 @@
+---
+hide:
+  - navigation
+---

docs/CONTRIBUTING.hdr.md

@@ -0,0 +1,4 @@
+---
+hide:
+  - navigation
+---

docs/README.hdr.md

@@ -0,0 +1,4 @@
+---
+hide:
+  - navigation
+---

docs/documentation.md

@@ -0,0 +1,9 @@
+---
+hide:
+  - navigation
+  - toc
+---
+
+# Documentation technique
+
+<iframe src="../html/index.html"></iframe>

docs/mkdocs.yml

@@ -0,0 +1,27 @@
+site_name: "Projet ROK4 - Librairies C++"
+site_url: https://rok4.github.io/core-cpp
+
+nav:
+    - Accueil: README.md
+    - Documentation technique: documentation.md
+    - Historique des versions: CHANGELOG.md
+    - Contribuer: CONTRIBUTING.md
+
+theme:
+    logo: https://rok4.github.io/assets/images/rok4-carre.png
+    favicon: https://rok4.github.io/assets/images/rok4-carre.png
+    name: material
+    features:
+        - navigation.tabs
+        - navigation.tabs.sticky
+    language: fr
+    custom_dir: overrides
+
+extra_css:
+    - https://rok4.github.io/assets/css/commun.css
+
+extra:
+    homepage: https://rok4.github.io
+    version:
+        provider: mike
+        default: latest

docs/overrides/main.html

@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+{% block outdated %}
+  🚨 Vous êtes sur la documentation d'une ancienne version. 🚨
+  <a href="{{ '../' ~ base_url }}"> 
+    <strong>Cliquez ici pour aller sur la dernière version.</strong>
+  </a>
+{% endblock %}

docs/requirements.txt

@@ -0,0 +1,3 @@
+mkdocs
+mkdocs-material
+mike

include/rok4/utils/Pyramid.h

@@ -175,14 +175,6 @@ class Pyramid : public Configuration {
      */
     bool addLevels (Pyramid* p, std::string bottomLevel, std::string topLevel);
 
-    /**
-     * \~french \brief Récupère le premier niveau
-     * \return level premier niveau
-     * \~english \brief Get the first level
-     * \return level first level
-     */
-    Level* getFirstLevel();
-
     /**
      * \~french \brief Récupère le plus haut niveau
      * \return level plus haut niveau