Merge branch 'main' into dependabot/gradle/samples/web-csr/dressca-ba…

…ckend/com.github.spotbugs-5.2.0
AlesInfiny · Nov 8, 2023 · 6cb0037 · 6cb0037
2 parents ece4dc5 + 408dbca
commit 6cb0037
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 13 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -12,6 +12,17 @@ updates:
       - "npm"
       - "dependencies"
 
+  - package-ecosystem: "npm"
+    directory: "/samples/web-csr/dressca-frontend"
+    schedule:
+      interval: "daily"
+    commit-message:
+      prefix: "npm-dressca-frontend"
+    labels:
+      - "target: Dressca"
+      - "npm"
+      - "dependencies"
+
   - package-ecosystem: "gradle"
     directory: "/samples/web-csr/dressca-backend"
     schedule:

diff --git a/.github/workflows/build-and-release-documents.yml b/.github/workflows/build-and-release-documents.yml
@@ -112,10 +112,15 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           python -m pip install mkdocs
-          python -m pip install mkdocs-material==9.1.21
+          python -m pip install mkdocs-material
           python -m pip install pymdown-extensions
           python -m pip install mkdocs-minify-plugin
 
+      - name: dressca.zip の作成
+        run: |
+          cd samples/web-csr
+          zip -r ../../documents/contents/samples/downloads/dressca.zip *
+
       - name: ドキュメントのビルド
         id: build_documents
         continue-on-error: true
@@ -126,25 +131,31 @@ jobs:
           else
             export VERSION="Test Version"
           fi
-          cd samples/web-csr
-          zip -r ../../documents/contents/samples/downloads/dressca.zip *
-          cd ../../documents
+          cd documents
           echo '# Mkdocs Build Result :factory:' >> $GITHUB_STEP_SUMMARY
           mkdocs build --verbose --clean --strict > mkdocs_build_log.txt
-          if [ $? = 0 ]; then
-            echo ':heavy_check_mark: mkdocs のビルドに成功しました。' >> $GITHUB_STEP_SUMMARY
-          else
-            echo ':x: mkdocs のビルドに失敗しました。' >> $GITHUB_STEP_SUMMARY
-          fi
+
+      - name: ドキュメントビルドの結果表示(成功)
+        if: ${{ steps.build_documents.outcome == 'success' }}
+        run: |
+          echo ':heavy_check_mark: mkdocs のビルドに成功しました。' >> $GITHUB_STEP_SUMMARY
+          cd documents
           if [ -s mkdocs_build_log.txt ]; then
             echo '```' >> $GITHUB_STEP_SUMMARY
             cat mkdocs_build_log.txt >> $GITHUB_STEP_SUMMARY
             echo '```' >> $GITHUB_STEP_SUMMARY
           fi
 
-      - name: ドキュメントビルドのの処理結果確認
+      - name: ドキュメントビルドの結果表示(失敗)
         if: ${{ steps.build_documents.outcome == 'failure' }}
         run: |
+          echo ':x: mkdocs のビルドに失敗しました。' >> $GITHUB_STEP_SUMMARY
+          cd documents
+          if [ -s mkdocs_build_log.txt ]; then
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            cat mkdocs_build_log.txt >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+          fi
           exit 1
 
       - name: IIS 用のファイル配置とパッケージング

diff --git a/documents/mkdocs.yml b/documents/mkdocs.yml
@@ -71,7 +71,6 @@ theme:
     text: Noto Sans JP
     code: Source Code Pro
   language: ja
-  locale: ja
   logo: assets/maia-logo.png
   palette:
     - media: "(prefers-color-scheme: light)"
@@ -105,8 +104,8 @@ markdown_extensions:
   - def_list
   - pymdownx.details
   - pymdownx.emoji:
-      emoji_index: !!python/name:materialx.emoji.twemoji
-      emoji_generator: !!python/name:materialx.emoji.to_svg
+      emoji_index: !!python/name:material.extensions.emoji.twemoji
+      emoji_generator: !!python/name:material.extensions.emoji.to_svg
   - pymdownx.highlight:
       linenums: true
   - pymdownx.inlinehilite