Merge pull request #1 from aq2r/dev

fix bug
aq2r · Dec 4, 2024 · 94af339 · 94af339
2 parents 9cad795 + 424fa7d
commit 94af339
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 9 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -10,15 +10,31 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+            archive-name: linux
+            archive-suffix: tar.gz
+            archive-cmd: tar czf
+            executable-suffix: ""
+          - os: windows-latest
+            target: x86_64-pc-windows-msvc
+            archive-name: windows
+            archive-suffix: zip
+            archive-cmd: 7z a
+            executable-suffix: .exe
+
+    runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
         with:
-          targets: x86_64-pc-windows-msvc
+          targets: ${{ matrix.target }}
 
       - name: Install cargo-about
         run: cargo install cargo-about
@@ -37,16 +53,16 @@ jobs:
         run: |
           TAG_NAME=${GITHUB_REF#refs/tags/}
           REPO_NAME=${GITHUB_REPOSITORY##*/}
-          RELEASE_NAME="${REPO_NAME}-${TAG_NAME}-windows"
+          RELEASE_NAME="${REPO_NAME}-${TAG_NAME}-${{ matrix.archive-name }}"
 
           mkdir -p "${RELEASE_NAME}"
-          cp "target/release/${REPO_NAME}.exe" "${RELEASE_NAME}/"
+          cp "target/release/${REPO_NAME}${{ matrix.executable-suffix }}" "${RELEASE_NAME}/"
           cp LICENSE README.md ThirdPartyLicenses.html "${RELEASE_NAME}/"
-          7z a "${RELEASE_NAME}.zip" "${RELEASE_NAME}"
+          ${{ matrix.archive-cmd }} "${RELEASE_NAME}.${{ matrix.archive-suffix }}" "${RELEASE_NAME}"
 
       - name: Create Release
         uses: softprops/action-gh-release@v1
         with:
-          files: "*.zip"
+          files: "*.${{ matrix.archive-suffix }}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/crates/sbv2_api/src/model_info.rs b/crates/sbv2_api/src/model_info.rs
@@ -62,10 +62,16 @@ impl Sbv2ModelInfo {
         for (model_id_obj, model_info_obj) in json_value.as_object().unwrap().iter() {
             let model_id: u32 = model_id_obj.parse()?;
 
+            let config_path = model_info_obj["config_path"].to_string();
+
+            let split_pattern = match config_path.contains("\\\\") {
+                true => "\\\\",
+                false => "/",
+            };
+
             // モデルのフォルダ名
-            let folder_name = model_info_obj["config_path"]
-                .to_string()
-                .split("\\\\")
+            let folder_name = config_path
+                .split(split_pattern)
                 .nth(1)
                 .context("None Error")?
                 .to_string();