fix workflows

.github/workflows/format.yml

@@ -16,18 +16,15 @@ jobs:
     environment: dev
     strategy:
       matrix:
-        rust: [ nightly ]
+        rust: [ stable ]
     steps:
       - uses: hecrj/setup-rust-action@v1
         with:
           rust-version: ${{ matrix.rust }}
           components: rustfmt, clippy
       - uses: actions/checkout@master
 
-      - name: Clone submodule
-        run: git submodule update --init libsensors
-
-      - name: Build libsensors
+      - name: Make libsensors
         run: make libsensors
 
       - name: cargo format + clippy

.github/workflows/test.yml

@@ -16,19 +16,15 @@ jobs:
     environment: dev
     strategy:
       matrix:
-        rust: [ nightly ]
+        rust: [ stable ]
     steps:
       - uses: hecrj/setup-rust-action@v1
         with:
           rust-version: ${{ matrix.rust }}
       - uses: actions/checkout@master
 
-      - name: Clone submodule
-        run: git submodule update --init libsensors
-
-      - name: Build libsensors
+      - name: Make libsensors
         run: make libsensors
 
       - name: Run tests
-        run: |
-          cargo test --all --all-features
+        run: make test

.github/workflows/upload_artifacts.yml

@@ -6,22 +6,16 @@ permissions:
 jobs:
   upload_linux_artifact:
     runs-on: "ubuntu-latest"
-    strategy:
-      matrix:
-        rust: [ nightly ]
     steps:
       - uses: hecrj/setup-rust-action@v1
         with:
-          rust-version: nightly
+          rust-version: stable
       - uses: actions/checkout@master
 
-      - name: Clone submodule
-        run: git submodule update --init libsensors
-
-      - name: Build libsensors
+      - name: Make libsensors
         run: make libsensors
 
-      - name: build release
+      - name: Build release
         run: cargo build --release
 
       - name: Upload Linux artifact
@@ -33,21 +27,18 @@ jobs:
   # TODO: experiment cross compile: linux -> win
   upload_windows_artifact:
     runs-on: "windows-latest"
-    strategy:
-      matrix:
-        rust: [ nightly ]
     steps:
       - uses: hecrj/setup-rust-action@v1
         with:
-          rust-version: nightly
+          rust-version: stable
       - uses: actions/checkout@master
-      - name: build lhm
-        run: |
-          cd LibreHardwareMonitorWrapper
-          dotnet build
-      - name: build release
-        run: |
-          cargo build --release
+
+      - name: Make lhm
+        run: make lmh
+
+      - name: Build release
+        run: cargo build --release
+
       - name: Upload Linux artifact
         uses: actions/upload-artifact@v3.1.2
         with:

Makefile

@@ -26,11 +26,15 @@ expand:
 	clear && cargo expand
 
 libsensors:
+	git submodule update --init hardware/libsensors
 	make -C ./hardware/libsensors/ install PREFIX=./../../target/libsensors_build ETCDIR=./../../target/libsensors_build/etc
 
 clean-libsensors:
 	make -C ./hardware/libsensors/ clean uninstall PREFIX=./../../target/libsensors_build ETCDIR=./../../target/libsensors_build/etc
 
+lhm:
+	dotnet build
+
 test:
 	clear && cargo test --all --all-features