Cbor is very broken on windows, so removing it. Add the openstudio-ge…

…ms package that only includes msgpack (which builds fine)
NREL · Nov 17, 2021 · 20ecc9b · 20ecc9b
1 parent a887d0c
commit 20ecc9b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -768,21 +768,21 @@ if(BUILD_CLI)
   if(UNIX)
      if(APPLE)
        set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20211117-darwin.tar.gz")
-       set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "cc9ecc1f64f8f168f9df8d64466c3a40")
+       set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "2a5d7d25e79f9c7a791adfe7e9fa699d")
        if (USE_OPENSTUDIO_GEMS_PR)
          set(OPENSTUDIO_GEMS_BASEURL "${OPENSTUDIO_GEMS_BASEURL}/openstudio-gems-osx/${OPENSTUDIO_GEMS_PR_NUMBER}")
        endif()
      else()
        set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20211117-linux.tar.gz")
-       set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "a2542f94c16d699818479c968751ef8c")
+       set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "86adc1d50d28bf2f197bbf4167aaa689")
        if (USE_OPENSTUDIO_GEMS_PR)
          set(OPENSTUDIO_GEMS_BASEURL "${OPENSTUDIO_GEMS_BASEURL}/openstudio-gems-linux/${OPENSTUDIO_GEMS_PR_NUMBER}")
        endif()
      endif()
   elseif(WIN32)
     # OpenStudio gems are only supported on 64 bit windows
     set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20211117-windows.tar.gz")
-    set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "2e33d4bd7a1b1380e4f9ae3fc54527aa")
+    set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "1822f2fee9517b134c0ba868f8b31f43")
     if (USE_OPENSTUDIO_GEMS_PR)
       set(OPENSTUDIO_GEMS_BASEURL "${OPENSTUDIO_GEMS_BASEURL}/openstudio-gems-windows/${OPENSTUDIO_GEMS_PR_NUMBER}")
     endif()

diff --git a/src/cli/test/test_embedded_ruby.rb b/src/cli/test/test_embedded_ruby.rb
@@ -217,13 +217,13 @@ def test_embedded_gems
     assert(true)
   end
 
-  def test_cbor
-    require 'cbor'
-    data = [1, 2, 33.5, 4]
-    s = data.to_cbor
-    data2 = CBOR.decode(s)
-    assert(data == data2)
-  end
+  # def test_cbor
+  #   require 'cbor'
+  #   data = [1, 2, 33.5, 4]
+  #   s = data.to_cbor
+  #   data2 = CBOR.decode(s)
+  #   assert(data == data2)
+  # end
 
   def test_msgpack
     require 'msgpack'