Load artifacts on failed build

releung · Jun 13, 2020 · 0167daf · 0167daf
1 parent e6d2be3
commit 0167daf
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 20 deletions.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -1,4 +1,4 @@
-name: linux-build
+name: Linux
 
 on:
   push:
@@ -60,15 +60,9 @@ jobs:
         ccache -s
         ctest -j4
 
-    # - name: Functional test output
-    #   if: failure()
-    #   run: |
-    #     cd $GITHUB_WORKSPACE/build
-    #     cat Testing/Temporary/LastTest.log        
-
     - name: upload test logs
       uses: actions/upload-artifact@v2
       if: failure()
       with:
          name: LastTest.log
-         path: /home/runner/work/qt-mvvm/qt-mvvm/build/Testing/Temporary/LastTest.log  
+         path: ./build/Testing/Temporary/LastTest.log  
diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -1,4 +1,4 @@
-name: macos-build
+name: MacOS
 
 on:
   push:
@@ -71,9 +71,16 @@ jobs:
         ccache -s
         ctest -j4
 
-    - name: Functional test output
+    - name: upload test logs
+      uses: actions/upload-artifact@v2
       if: failure()
-      run: |
-        cd $GITHUB_WORKSPACE/build
-        cat Testing/Temporary/LastTest.log        
+      with:
+         name: LastTest.log
+         path: ./build/Testing/Temporary/LastTest.log  
+
+    # - name: Functional test output
+    #   if: failure()
+    #   run: |
+    #     cd $GITHUB_WORKSPACE/build
+    #     cat Testing/Temporary/LastTest.log        
 
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
@@ -1,4 +1,4 @@
-name: windows-build
+name: Windows
 
 env:
   CCACHE_VERSION: 3.7.7

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # Model View ViewModel framework for large C++ Qt applications
 
-![aaa](https://github.com/gpospelov/qt-mvvm/workflows/linux-build/badge.svg?branch=ci-test)
-
-[![Linux](https://github.com/gpospelov/qt-mvvm/workflows/linux-build/badge.svg?branch=ci-test)](https://github.com/gpospelov/qt-mvvm/actions?query=workflow%3Alinux-build)
+[![Linux](https://github.com/gpospelov/qt-mvvm/workflows/linux-build/badge.svg?branch=ci-test)](https://github.com/gpospelov/qt-mvvm/actions?query=workflow%3ALinux)
+[![Windows](https://github.com/gpospelov/qt-mvvm/workflows/lwindows-build/badge.svg?branch=ci-test)](https://github.com/gpospelov/qt-mvvm/actions?query=workflow%3AWindows)
+[![Mac OS](https://github.com/gpospelov/qt-mvvm/workflows/macos-build/badge.svg?branch=ci-test)](https://github.com/gpospelov/qt-mvvm/actions?query=workflow%3AMacOS)
 
 
 [![Travis-CI Build Status](https://travis-ci.org/gpospelov/qt-mvvm.svg?branch=master)](https://travis-ci.org/gpospelov/qt-mvvm)

diff --git a/source/libmvvm_model/mvvm/serialization/jsondocument.cpp b/source/libmvvm_model/mvvm/serialization/jsondocument.cpp
@@ -75,8 +75,10 @@ void JsonDocument::load(const std::string& file_name)
 
     ModelView::JsonModelConverter converter;
     int index(0);
-    for (auto model : p_impl->models)
-        converter.json_to_model(array.at(index++).toObject(), *model);
+    for (auto model : p_impl->models) {
+        converter.json_to_model(array.at(index).toObject(), *model);
+        ++index;
+    }
 
     file.close();
 }

diff --git a/source/libmvvm_model/mvvm/serialization/jsonmodelconverter.cpp b/source/libmvvm_model/mvvm/serialization/jsonmodelconverter.cpp
@@ -63,7 +63,9 @@ void JsonModelConverter::json_to_model(const QJsonObject& json, SessionModel& mo
         throw std::runtime_error("JsonModel::json_to_model() -> Error. Invalid json object.");
 
     if (json[modelKey].toString() != QString::fromStdString(model.modelType()))
-        throw std::runtime_error("JsonModel::json_to_model() -> Unexpected model type.");
+        throw std::runtime_error("JsonModel::json_to_model() -> Unexpected model type '"
+                                 + model.modelType() + "', json key '"
+                                 + json[modelKey].toString().toStdString() + "'");
 
     auto converter = std::make_unique<JsonItemConverter>(model.factory());