Fixes (#1136)

* Fix component repo * Exclude single golem executable for windows * Fix CI
golemcloud · Dec 5, 2024 · af67ccd · af67ccd
1 parent 0f3c92d
commit af67ccd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -507,6 +507,11 @@ jobs:
             os: macos-latest
           - rust-target: x86_64-pc-windows-gnu
             os: windows-latest
+        exclude:
+          - project: golem
+            cfg:
+              rust-target: x86_64-pc-windows-gnu
+              os: windows-latest # excluded for now because sozu-proxy is not compilable on windows
     name: Publish binaries of ${{ matrix.project }}
     runs-on: ${{ matrix.cfg.os }}
     permissions:

diff --git a/golem-component-service-base/src/repo/component.rs b/golem-component-service-base/src/repo/component.rs
@@ -51,8 +51,8 @@ pub struct ComponentRecord<Owner: ComponentOwner> {
     pub created_at: DateTime<Utc>,
     pub component_type: i32,
     pub available: bool,
-    pub object_store_key: String,
-    pub transformed_object_store_key: String,
+    pub object_store_key: Option<String>,
+    pub transformed_object_store_key: Option<String>,
     // one-to-many relationship. Retrieved separately
     #[sqlx(skip)]
     pub files: Vec<FileRecord>,
@@ -84,10 +84,12 @@ impl<Owner: ComponentOwner> ComponentRecord<Owner> {
             created_at: value.created_at,
             component_type: value.component_type as i32,
             available,
-            object_store_key: object_store_key.clone(),
-            transformed_object_store_key: value
-                .transformed_object_store_key
-                .unwrap_or(object_store_key),
+            object_store_key: Some(object_store_key.clone()),
+            transformed_object_store_key: Some(
+                value
+                    .transformed_object_store_key
+                    .unwrap_or(object_store_key),
+            ),
             files: value
                 .files
                 .iter()
@@ -141,8 +143,8 @@ impl<Owner: ComponentOwner> TryFrom<ComponentRecord<Owner>> for Component<Owner>
             versioned_component_id,
             created_at: value.created_at,
             component_type: ComponentType::try_from(value.component_type)?,
-            object_store_key: Some(value.object_store_key),
-            transformed_object_store_key: Some(value.transformed_object_store_key),
+            object_store_key: value.object_store_key,
+            transformed_object_store_key: value.transformed_object_store_key,
             files,
             installed_plugins: value
                 .installed_plugins