fix: add wasm to possible targets

tailcallhq · Nov 8, 2024 · f74da3d · f74da3d
1 parent 4dfbd11
commit f74da3d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/workspace/gh-workflow-gen/build.rs b/workspace/gh-workflow-gen/build.rs
@@ -34,7 +34,6 @@ fn main() {
         .on(on_push)
         .on(on_pull_request)
         .add_job("build", job_build)
-        .unwrap()
         .generate()
         .unwrap();
 }
diff --git a/workspace/gh-workflow/src/toolchain.rs b/workspace/gh-workflow/src/toolchain.rs
@@ -52,6 +52,7 @@ pub enum Arch {
     X86_64,
     Aarch64,
     Arm,
+    Wasm32,
 }
 
 impl Display for Arch {
@@ -60,6 +61,7 @@ impl Display for Arch {
             Arch::X86_64 => "x86_64",
             Arch::Aarch64 => "aarch64",
             Arch::Arm => "arm",
+            Arch::Wasm32 => "wasm32",
         };
         write!(f, "{}", val)
     }
@@ -125,10 +127,10 @@ impl Display for Abi {
 
 #[derive(Clone, Setters)]
 pub struct Target {
-    arch: Arch,
-    vendor: Vendor,
-    system: System,
-    abi: Option<Abi>,
+    pub arch: Arch,
+    pub vendor: Vendor,
+    pub system: System,
+    pub abi: Option<Abi>,
 }
 
 /// A Rust representation for the inputs of the setup-rust action.
@@ -139,6 +141,7 @@ pub struct Target {
 #[setters(strip_option)]
 pub struct ToolchainStep {
     pub toolchain: Vec<Toolchain>,
+    #[setters(skip)]
     pub target: Option<Target>,
     pub components: Vec<Component>,
     pub cache: Option<bool>,
@@ -181,6 +184,11 @@ impl ToolchainStep {
         self.components.push(Component::Rustfmt);
         self
     }
+
+    pub fn target(mut self, arch: Arch, vendor: Vendor, system: System, abi: Option<Abi>) -> Self {
+        self.target = Some(Target { arch, vendor, system, abi });
+        self
+    }
 }
 
 impl AddStep for ToolchainStep {

diff --git a/workspace/gh-workflow/src/workflow.rs b/workspace/gh-workflow/src/workflow.rs
@@ -7,7 +7,7 @@ use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-use crate::error::{Error, Result};
+use crate::error::Result;
 use crate::generate::Generate;
 use crate::{EventValue, ToolchainStep};
 
@@ -57,14 +57,11 @@ impl Workflow {
         Ok(serde_yaml::to_string(self)?)
     }
 
-    pub fn add_job<T: ToString, J: Into<Job>>(mut self, id: T, job: J) -> Result<Self> {
+    pub fn add_job<T: ToString, J: Into<Job>>(mut self, id: T, job: J) -> Self {
         let key = id.to_string();
-        if self.jobs.contains_key(&key) {
-            return Err(Error::JobIdAlreadyExists(key.as_str().to_string()));
-        }
 
         self.jobs.insert(key, job.into());
-        Ok(self)
+        self
     }
 
     pub fn parse(yml: &str) -> Result<Self> {