From 915cc32be263b8e1e72b38f8fc29d5d26b6ef85f Mon Sep 17 00:00:00 2001 From: "David P. Chassin" Date: Sat, 3 Oct 2020 10:36:15 -0700 Subject: [PATCH 1/2] Update json.cpp --- gldcore/json.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gldcore/json.cpp b/gldcore/json.cpp index 649fe9e61..7275b9275 100644 --- a/gldcore/json.cpp +++ b/gldcore/json.cpp @@ -273,16 +273,20 @@ int GldJsonWriter::write_classes(FILE *fp) } if ( prop->unit != NULL ) { - write(",\n\t\t\t\t\"unit\" : \"%s\"",prop->unit->name); + len += write(",\n\t\t\t\t\"unit\" : \"%s\"",prop->unit->name); } if ( prop->default_value != NULL ) { PROPERTYSPEC *spec = property_getspec(prop->ptype); if ( spec != NULL && prop->default_value != spec->default_value ) { - write(",\n\t\t\t\t\"default\" : \"%s\"",prop->default_value); + len += write(",\n\t\t\t\t\"default\" : \"%s\"",prop->default_value); } } + if ( prop->description != NULL ) + { + len += write(",\n\t\t\t\t\"description\" : \"%s\"",prop->description); + } len += write("\n\t\t\t}"); } len += write("\n\t\t}"); @@ -612,7 +616,7 @@ int GldJsonWriter::write_output(FILE *fp) int len = 0; json = fp; len += write("{\t\"application\": \"gridlabd\",\n"); - len += write("\t\"version\" : \"%u.%u.%u\"",global_version_major,global_version_minor,version); + len += write("\t\"version\" : \"%u.%u.%u\"",global_version_major,global_version_minor,global_version_patch); if ( (global_filesave_options&FSO_MODULES) == FSO_MODULES ) { len += write_modules(fp); From d7a349625f9fee06902108933d675604f059c068 Mon Sep 17 00:00:00 2001 From: "David P. Chassin" Date: Mon, 5 Oct 2020 14:31:16 -0700 Subject: [PATCH 2/2] Update develop.yml --- .github/workflows/develop.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index b6541dab6..2376622a4 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -22,8 +22,7 @@ jobs: run: make -j10 system - name: Validate build run: | - gridlabd -D keep_progress=TRUE -T 0 --validate - utilities/save_validation_errors || true + gridlabd -D keep_progress=TRUE -T 0 --validate || utilities/save_validation_errors - name: Upload artifacts uses: actions/upload-artifact@v2 with: