Merge pull request #2705 from wasmerio/fix_headless

Fix headless build and test it in CI

.github/workflows/test-sys.yaml

@@ -224,9 +224,8 @@ jobs:
           target: ${{ matrix.target }}
           override: true
           components: "rust-src"
-        if: needs.setup.outputs.DOING_RELEASE == '1'
       - name: Build Minimal Wasmer Headless
-        if: needs.setup.outputs.DOING_RELEASE == '1' && matrix.build != 'linux-musl-x64'
+        if: matrix.build != 'linux-musl-x64'
         run: |
           cargo install xargo
           echo "" >> Cargo.toml

Xargo.toml

@@ -1,2 +1,2 @@
 [dependencies]
-std = {default-features=false, features=["panic_immediate_abort"]}
+std = {}

lib/cli/src/commands/run.rs

@@ -23,6 +23,7 @@ use wasi::Wasi;
 /// The options for the `wasmer run` subcommand
 pub struct Run {
     /// Disable the cache
+    #[cfg(feature = "cache")]
     #[structopt(long = "disable-cache")]
     disable_cache: bool,
 
@@ -43,6 +44,7 @@ pub struct Run {
     /// A prehashed string, used to speed up start times by avoiding hashing the
     /// wasm module. If the specified hash is not found, Wasmer will hash the module
     /// as if no `cache-key` argument was passed.
+    #[cfg(feature = "cache")]
     #[structopt(long = "cache-key", hidden = true)]
     cache_key: Option<String>,
 
@@ -64,6 +66,7 @@ pub struct Run {
     #[structopt(long = "debug", short = "d")]
     debug: bool,
 
+    #[cfg(feature = "debug")]
     #[structopt(short, long, parse(from_occurrences))]
     verbose: u8,
 

lib/cli/src/store.rs

@@ -15,6 +15,7 @@ use wasmer_compiler::CompilerConfig;
 #[derive(Debug, Clone, StructOpt, Default)]
 /// The compiler and engine options
 pub struct StoreOptions {
+    #[cfg(feature = "compiler")]
     #[structopt(flatten)]
     compiler: CompilerOptions,
 
@@ -43,6 +44,7 @@ pub struct StoreOptions {
     object_file: bool,
 }
 
+#[cfg(feature = "compiler")]
 #[derive(Debug, Clone, StructOpt, Default)]
 /// The compiler options
 pub struct CompilerOptions {
@@ -63,6 +65,7 @@ pub struct CompilerOptions {
     enable_verifier: bool,
 
     /// LLVM debug directory, where IR and object files will be written to.
+    #[cfg(feature = "llvm")]
     #[structopt(long, parse(from_os_str))]
     llvm_debug_dir: Option<PathBuf>,