Merge branch 'main' into bump-swig-v4.2.1

shogo82148 · Jun 30, 2024 · 6188ebf · 6188ebf
2 parents f400141 + 8e2d28e
commit 6188ebf
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 14 deletions.
diff --git a/.github/workflows/test-darwin-perl.yml b/.github/workflows/test-darwin-perl.yml
@@ -20,6 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         perl:
+          - "5.40"
           - "5.38"
           - "5.36"
           - "5.34"

diff --git a/.github/workflows/test-darwin-ruby.yml b/.github/workflows/test-darwin-ruby.yml
@@ -15,19 +15,27 @@ on:
 jobs:
   test:
     name: Test
-    runs-on: macOS-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - "3.3"
-          - "3.2"
-          - "3.1"
-          - "3.0"
-          - "2.7"
-          - "2.6"
-          - "2.5"
-          - "2.4"
+        include:
+          - os: macos-latest
+            ruby: "3.3"
+          - os: macos-latest
+            ruby: "3.2"
+          - os: macos-latest
+            ruby: "3.1"
+          - os: macos-latest
+            ruby: "3.0"
+          - os: macos-latest
+            ruby: "2.7"
+          - os: macos-latest
+            ruby: "2.6"
+          - os: macos-13
+            ruby: "2.5"
+          - os: macos-13
+            ruby: "2.4"
     steps:
       - uses: actions/checkout@v4
       - name: setup

diff --git a/.github/workflows/test-linux-java.yml b/.github/workflows/test-linux-java.yml
@@ -27,6 +27,9 @@ jobs:
           - "11"
           - "17"
           - "21"
+        exclude:
+          - distribution: temurin
+            java: "8"
     steps:
       - run: sudo apt-get install gettext
       - uses: actions/checkout@v4

diff --git a/.github/workflows/test-linux-perl.yml b/.github/workflows/test-linux-perl.yml
@@ -20,6 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         perl:
+          - "5.40"
           - "5.38"
           - "5.36"
           - "5.34"

diff --git a/docs/mecab.html b/docs/mecab.html
@@ -4,7 +4,7 @@
 <HTML><HEAD><TITLE>Man page of MECAB</TITLE>
 </HEAD><BODY>
 <H1>MECAB</H1>
-Section: User Commands (1)<BR>Updated: January 2024<BR><A HREF="#index">Index</A>
+Section: User Commands (1)<BR>Updated: June 2024<BR><A HREF="#index">Index</A>
 <A HREF="/cgi-bin/man/man2html">Return to Main Contents</A><HR>
 
 <A NAME="lbAB">&nbsp;</A>
@@ -90,6 +90,6 @@ <H2>DESCRIPTION</H2>
 This document was created by
 <A HREF="/cgi-bin/man/man2html">man2html</A>,
 using the manual pages.<BR>
-Time: 16:02:10 GMT, June 30, 2024
+Time: 16:23:17 GMT, June 30, 2024
 </BODY>
 </HTML>
diff --git a/mecab/doc/mecab.html b/mecab/doc/mecab.html
@@ -4,7 +4,7 @@
 <HTML><HEAD><TITLE>Man page of MECAB</TITLE>
 </HEAD><BODY>
 <H1>MECAB</H1>
-Section: User Commands (1)<BR>Updated: January 2024<BR><A HREF="#index">Index</A>
+Section: User Commands (1)<BR>Updated: June 2024<BR><A HREF="#index">Index</A>
 <A HREF="/cgi-bin/man/man2html">Return to Main Contents</A><HR>
 
 <A NAME="lbAB">&nbsp;</A>
@@ -90,6 +90,6 @@ <H2>DESCRIPTION</H2>
 This document was created by
 <A HREF="/cgi-bin/man/man2html">man2html</A>,
 using the manual pages.<BR>
-Time: 16:02:10 GMT, June 30, 2024
+Time: 16:23:17 GMT, June 30, 2024
 </BODY>
 </HTML>