Merge branch 'develop' into release-2.0

issp-center-dev · Mar 21, 2024 · 7b26ba8 · 7b26ba8
2 parents c57bf95 + 7f084c8
commit 7b26ba8
Show file tree

Hide file tree

Showing 77 changed files with 2,365 additions and 1,783 deletions.
diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml
@@ -11,29 +11,30 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Inject slug/short variables
-      uses: rlespinasse/github-slug-action@v3.x
+      uses: rlespinasse/github-slug-action@v4.x
 
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: main
 
     - name: Checkout gh-pages
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         ref: gh-pages
         path: gh-pages
 
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v5
       with:
         python-version: 3.8
 
     - name: Prepare LaTeX env
       run: |
+        sudo apt update
         sudo apt install \
           texlive-latex-recommended texlive-latex-extra \
           texlive-lang-japanese texlive-fonts-recommended texlive-fonts-extra latexmk
@@ -42,7 +43,7 @@ jobs:
     - name: Install python packages
       run: |
         python -m pip install --upgrade pip
-        pip install sphinx
+        pip install sphinx sphinxcontrib-spelling
 
     - name: Build
       run: |

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,33 +4,41 @@ on: [push]
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: ['ubuntu-20.04', 'ubuntu-22.04']
+      fail-fast: false
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
 
       - name: apt
         run: |
+          sudo apt update
           sudo apt install \
             gcc gfortran cmake wget liblapack-dev \
             openmpi-bin libopenmpi-dev
 
       - name: pip install
         run: |
           python -m pip install -U pip
+          python -m pip install numpy scipy toml
+          python -m pip install typing_extensions
 
       - name: make workspace
         run: cmake -E make_directory ${{runner.workspace}}/build
 
       - name: cmake
         working-directory: ${{runner.workspace}}/build
         shell: bash
-        run: cmake -DCMAKE_VERBOSE_MAKEFILE=1 $GITHUB_WORKSPACE
+        run: cmake -DPYTHON_EXECUTABLE=$(which python3) -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/usr -DCMAKE_VERBOSE_MAKEFILE=1 $GITHUB_WORKSPACE
 
       - name: build
         working-directory: ${{runner.workspace}}/build
@@ -41,3 +49,41 @@ jobs:
         working-directory: ${{runner.workspace}}/build
         shell: bash
         run: ctest -V
+
+      - name: install
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: make install
+
+
+  docs:
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.8
+
+    - name: Prepare LaTeX env
+      run: |
+        sudo apt update
+        sudo apt install \
+          texlive-latex-recommended texlive-latex-extra \
+          texlive-lang-japanese texlive-fonts-recommended texlive-fonts-extra latexmk
+        kanji-config-updmap-sys ipaex
+
+    - name: Install python packages
+      run: |
+        python -m pip install --upgrade pip
+        pip install sphinx sphinxcontrib-spelling
+
+    - name: Build
+      run: |
+        cd ${GITHUB_WORKSPACE}
+        cmake -E make_directory build
+        cd build
+        cmake -DDocument=ON ../
+        make doc