Merge branch 'main' into fix.posture.double.run.no.mfa

openziti · Mar 12, 2021 · 52142e0 · 52142e0
2 parents 2545f0c + 8a7baed
commit 52142e0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-latest
+          - ubuntu-18.04
           - macOS-latest
 
     steps:

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-latest
+          - ubuntu-18.04
           - macOS-latest
           - windows-latest
 

diff --git a/includes/ziti/model_support.h b/includes/ziti/model_support.h
@@ -295,14 +295,16 @@ static int Enum##_json(const ptr(Enum) e, int indent, char *json, size_t max, si
 return json_enum(e, json, max, len, &Enum##s);                              \
 }\
 static type_meta Enum##_meta = {\
-        .size = sizeof(int), \
+        .name = #Enum,        \
+        .size = sizeof(Enum), \
+        .field_count = 0,     \
+        .fields = NULL,       \
         .comparer = (_cmp_f) cmp_##Enum, \
         .parser = (_parse_f) parse_##Enum, \
         .jsonifier = (_to_json_f) Enum##_json, \
         };           \
 type_meta* get_##Enum##_meta() { return &Enum##_meta; }\
 
-
 #if __cplusplus
 }
 #endif