merge main into feature/display

SreeDan · Jul 6, 2024 · 937a890 · 937a890
2 parents 1a6369b + a3da641
commit 937a890
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/rust_ci.yml b/.github/workflows/rust_ci.yml
@@ -23,8 +23,6 @@ jobs:
             args: --release
           - command: fmt
             args: --all -- --check --color always
-          - command: clippy
-            args: --all-targets --all-features --workspace -- -D warnings
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -36,5 +34,15 @@ jobs:
           ldproxy: true
       - name: Enable caching
         uses: Swatinem/rust-cache@v2
+      - name: Create env txt files
+        run: | 
+          touch api_url.txt
+          touch auth_token.txt
+          touch wifi_ssid.txt
+          touch wifi_password.txt
+      - name: Downgrade ravif
+        run: cargo update ravif --precise 0.11.5
+      - name: Downgrade bitstream-io
+        run: cargo update bitstream-io --precise 2.3.0
       - name: Run command
         run: cargo ${{ matrix.action.command }} ${{ matrix.action.args }}
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
@@ -40,4 +40,4 @@ where
     let fill_style = PrimitiveStyle::with_fill(color);
 
     display_area.draw_styled(&fill_style, display);
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,4 +40,4 @@ where @@
         let fill_style = PrimitiveStyle::with_fill(color);
         display_area.draw_styled(&fill_style, display);
-    }
+    }