attest: remove flavors (#64)

* ci: Removed flavors from artifacts, we will only use runtime detection. * Removed prod feature from orb-attest
worldcoin · Apr 5, 2024 · c3d2ccd · c3d2ccd
1 parent 46cb086
commit c3d2ccd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 47 deletions.
diff --git a/orb-attest/Cargo.toml b/orb-attest/Cargo.toml
@@ -48,10 +48,6 @@ serial_test = "2.0"
 tempfile = "3.3"
 wiremock = "0.5"
 
-[features]
-default = []
-prod = [] # use prod backend
-
 [package.metadata.deb]
 maintainer-scripts = "debian/"
 systemd-units = [

diff --git a/orb-attest/src/config.rs b/orb-attest/src/config.rs
@@ -1,7 +1,6 @@
 use std::env;
 
-use eyre;
-use tracing::warn;
+use eyre::{self, bail};
 
 const ORB_BACKEND_ENV_VAR_NAME: &str = "ORB_BACKEND";
 
@@ -38,10 +37,7 @@ pub enum Backend {
     Staging,
 }
 
-#[cfg(feature = "prod")]
 const DEFAULT_BACKEND: Backend = Backend::Prod;
-#[cfg(not(feature = "prod"))]
-const DEFAULT_BACKEND: Backend = Backend::Staging;
 
 impl Default for Backend {
     fn default() -> Self {
@@ -63,11 +59,7 @@ impl Backend {
             "prod" => Ok(Backend::Prod),
             "stage" | "dev" => Ok(Backend::Staging),
             _ => {
-                warn!(
-                    "{ORB_BACKEND_ENV_VAR_NAME} is set to an unexpected value {v}, falling back \
-                     to default {DEFAULT_BACKEND:?}"
-                );
-                eyre::bail!("invalid backend");
+                bail!("unknown value for backend");
             }
         }
     }

diff --git a/scripts/build_rust_artifacts.py b/scripts/build_rust_artifacts.py
@@ -25,45 +25,34 @@ def main():
 
     args = parser.parse_args()
 
-    flavors = ["prod", "stage"]
     targets = ["aarch64", "x86_64"]
 
     targets_option = " ".join([f"--target {t}-unknown-linux-gnu" for t in targets])
     print(f"TARGETS={targets_option}")
 
-    for f in flavors:
-        if f == "prod":
-            features = ""
-        elif f == "stage":
-            features = "--features stage"
-        else:
-            print("Unexpected flavor")
-            sys.exit(1)
-
-        print(f"Building flavor={f}")
-        cmd(
-            f"cargo zigbuild --all "
-            f"--profile {args.cargo_profile} "
-            f"{targets_option} "
-            f"--no-default-features {features}"
-        )
+    cmd(
+        f"cargo zigbuild --all "
+        f"--profile {args.cargo_profile} "
+        f"{targets_option} "
+        f"--no-default-features"
+    )
 
-        for b in args.crates:
-            os.makedirs(os.path.join(args.out_dir, b), exist_ok=True)
-            print(f"Creating .deb package for {b}:")
-            for t in targets:
-                cmd(
-                    f"cargo deb --no-build --no-strip "
-                    f"--profile {args.cargo_profile} "
-                    f"-p {b} "
-                    f"--target {t}-unknown-linux-gnu "
-                    f"-o {args.out_dir}/{b}/{b}_{f}_{t}.deb"
-                )
-                cmd(
-                    f"cp -L "
-                    f"target/{t}-unknown-linux-gnu/{args.cargo_profile}/{b} "
-                    f"{args.out_dir}/{b}/{b}_{f}_{t}"
-                )
+    for b in args.crates:
+        os.makedirs(os.path.join(args.out_dir, b), exist_ok=True)
+        print(f"Creating .deb package for {b}:")
+        for t in targets:
+            cmd(
+                f"cargo deb --no-build --no-strip "
+                f"--profile {args.cargo_profile} "
+                f"-p {b} "
+                f"--target {t}-unknown-linux-gnu "
+                f"-o {args.out_dir}/{b}/{b}_{t}.deb"
+            )
+            cmd(
+                f"cp -L "
+                f"target/{t}-unknown-linux-gnu/{args.cargo_profile}/{b} "
+                f"{args.out_dir}/{b}/{b}_{t}"
+            )
 
 
 if __name__ == "__main__":