From 1a8c1c30551385a30d69d9a1e2f5c5002420d085 Mon Sep 17 00:00:00 2001
From: Cappy Ishihara <cappy@cappuchino.xyz>
Date: Sun, 24 Sep 2023 03:06:08 +0700
Subject: [PATCH] debug everything, clean up soem stuff

---
 .github/workflows/arm-build.yml | 15 +++++----------
 .gitignore                      |  1 +
 Cargo.lock                      |  8 ++++----
 Cargo.toml                      |  2 +-
 src/main.rs                     |  3 ++-
 tests/.env                      |  2 +-
 6 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/arm-build.yml b/.github/workflows/arm-build.yml
index 9060581..56fc30a 100644
--- a/.github/workflows/arm-build.yml
+++ b/.github/workflows/arm-build.yml
@@ -51,24 +51,19 @@ jobs:
           cargo \
           moby-engine
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+    #   - name: Set up QEMU
+    #     uses: docker/setup-qemu-action@v3
 
       - uses: Swatinem/rust-cache@v2
 
       - name: Build and install katsu
         run: |
           cargo install --path . --debug
-      - name: Prepare loop devices
-        run: |
-          for i in $(seq 0 23);
-          do
-              sudo mknod -m 0660 /dev/loop$i b 7 0  2> /dev/null || true
-          done
+
       - name: Run test
         run: |
           export PATH=$HOME/.cargo/bin:$PATH
-          export KATSU_LOG=trace
           pushd tests
-          COLORBT_SHOW_HIDDEN=1 katsu katsudon-arm.yaml 2>&1
+          echo "COLORBT_SHOW_HIDDEN=1" >> .env
+          katsu katsudon-arm.yaml 2>&1
           popd
diff --git a/.gitignore b/.gitignore
index 2f7896d..5f32e70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 target/
+.env
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index a6f666d..f370da0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -174,10 +174,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "dotenv"
-version = "0.15.0"
+name = "dotenvy"
+version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
 [[package]]
 name = "equivalent"
@@ -309,7 +309,7 @@ version = "0.1.0"
 dependencies = [
  "cmd_lib",
  "color-eyre",
- "dotenv",
+ "dotenvy",
  "glob",
  "in-container",
  "regex",
diff --git a/Cargo.toml b/Cargo.toml
index b2f6d20..c6fe38b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,9 +14,9 @@ tracing-subscriber = { version = "0.3.16", features = ["env-filter", "tracing-lo
 serde_derive = "1.0.152"
 serde = "1.0.152"
 smartstring = { version = "1.0.1", features = ["serde"]}
-dotenv = "0.15.0"
 tracing-error = "0.2.0"
 regex = { version = "1.8.4", features = ["unicode-case"] }
 glob = "0.3.1"
 cmd_lib = "1.3.0"
 serde_yaml = "0.9.25"
+dotenvy = "0.15.7"
diff --git a/src/main.rs b/src/main.rs
index dec9104..90dfe46 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -9,7 +9,8 @@ use tracing::trace;
 use tracing_subscriber::{prelude::__tracing_subscriber_SubscriberExt, Layer};
 
 fn main() -> Result<()> {
-	dotenv::dotenv()?;
+	dotenvy::dotenv()?;
+
 	color_eyre::install()?;
 	let subscriber =
 		tracing_subscriber::Registry::default().with(tracing_error::ErrorLayer::default()).with(
diff --git a/tests/.env b/tests/.env
index 27e1ba8..8099926 100644
--- a/tests/.env
+++ b/tests/.env
@@ -1,3 +1,3 @@
 # KATSU_TABEN=trace
-KATSU_TABEN=info
+KATSU_LOG=trace
 RUST_BACKTRACE=full