Merge branch 'master' into 646

MAIF · Oct 30, 2024 · d4c5c7e · d4c5c7e
2 parents c37ee74 + 8812713
commit d4c5c7e
Show file tree

Hide file tree

Showing 25 changed files with 888 additions and 561 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -64,28 +64,28 @@ jobs:
         git config --local user.name "daikoku-github-actions"
         git add --all
         git commit -am "Update version number before release"
-    # - name: build manual
-    #   id: manual
-    #   run: |
-    #     cd manual
-    #     sbt "release release-version ${{ github.event.inputs.releaseversion }}"
-    #     cd ..
-    #     sh ./scripts/build.sh manual
-    #     echo "diff=$(git diff --numstat | wc -l)" >> $GITHUB_OUTPUT
-    #     cd ..
-    # - name: Commit manual
-    #   if: steps.manual.outputs.diff != '0'
-    #   run: |
-    #     git config --local user.email "daikoku-github-actions@users.noreply.github.com"
-    #     git config --local user.name "daikoku-github-actions"
-    #     git add --all
-    #     git commit -am "Update documentation before release"
-    # - name: Push manual
-    #   uses: ad-m/github-push-action@master
-    #   if: steps.manual.outputs.diff != '0'
-    #   with:
-    #     branch: ${{ github.ref }}
-    #     github_token: ${{ secrets.GITHUB_TOKEN}}
+    - name: build manual
+      id: manual
+      run: |
+        cd manual
+        sbt "release release-version ${{ github.event.inputs.releaseversion }}"
+        cd ..
+        sh ./scripts/build.sh manual
+        echo "diff=$(git diff --numstat | wc -l)" >> $GITHUB_OUTPUT
+        cd ..
+    - name: Commit manual
+      if: steps.manual.outputs.diff != '0'
+      run: |
+        git config --local user.email "daikoku-github-actions@users.noreply.github.com"
+        git config --local user.name "daikoku-github-actions"
+        git add --all
+        git commit -am "Update documentation before release"
+    - name: Push manual
+      uses: ad-m/github-push-action@master
+      if: steps.manual.outputs.diff != '0'
+      with:
+        branch: ${{ github.ref }}
+        github_token: ${{ secrets.GITHUB_TOKEN}}
     # release sbt (with auto commit tag)
     - name: release sbt
       run: |

diff --git a/.gitignore b/.gitignore
@@ -33,4 +33,9 @@ daikoku/public/assets/
 daikoku/public/index.html
 daikoku/public/index*
 daikoku/public/fa-*
+daikoku/public/asciidoctor-*
+daikoku/public/asyncapi-*
+daikoku/public/backofffice-*
+daikoku/public/highlight-*
+daikoku/public/swagger-*
 stats.html