rework rust ci a bit

Decompollaborate · Dec 16, 2023 · 9585261 · 9585261
1 parent 5d94ec8
commit 9585261
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 6 deletions.
diff --git a/.github/workflows/publish_crate.yml b/.github/workflows/publish_crate.yml
@@ -4,8 +4,8 @@ name: Build and upload Rust crate
 on: [push, pull_request]
 
 jobs:
-  build_rust:
-    name: Build Rust stuff and run Rust tests
+  check_fmt:
+    name: Check format
     runs-on: ubuntu-latest
 
     steps:
@@ -21,18 +21,60 @@ jobs:
     - name: Check format
       run: cargo fmt --check
 
+  check_clippy:
+    name: Check clippy
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout reposistory
+      uses: actions/checkout@v4
+
+    - name: Setup Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        override: true
+
     - name: Setup clippy
       run: rustup component add clippy
 
     - name: Run clippy
       run: cargo clippy --all-targets --all-features -- -D warnings
 
-    - name: Build Rust package
-      run: cargo build --release --workspace
+  run_tests:
+    name: Run tests
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout reposistory
+      uses: actions/checkout@v4
+
+    - name: Setup Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        override: true
 
-    - name: Build Rust tests
+    - name: Run tests
       run: cargo test --workspace
 
+  publish:
+    name: Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout reposistory
+      uses: actions/checkout@v4
+
+    - name: Setup Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        override: true
+
+    - name: Build Rust package
+      run: cargo build --release --workspace
+
     - name: Publish dry run
       if: github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/')
       run: cargo publish --dry-run

diff --git a/src/rs/cickinds.rs b/src/rs/cickinds.rs
@@ -72,7 +72,9 @@ impl CICKind {
     pub fn from_name(name: &str) -> Option<CICKind> {
         match name {
             "CIC_6101" | "6101" => Some(Self::CIC_6101),
-            "CIC_6102_7101" | "CIC_6102" | "CIC_7101" | "6102_7101" | "6102" | "7101" => Some(Self::CIC_6102_7101),
+            "CIC_6102_7101" | "CIC_6102" | "CIC_7101" | "6102_7101" | "6102" | "7101" => {
+                Some(Self::CIC_6102_7101)
+            }
             "CIC_7102" | "7102" => Some(Self::CIC_7102),
             "CIC_X103" | "CIC_6103" | "CIC_7103" | "X103" | "6103" | "7103" => Some(Self::CIC_X103),
             "CIC_X105" | "CIC_6105" | "CIC_7105" | "X105" | "6105" | "7105" => Some(Self::CIC_X105),